diff --git a/src/plugins/PyFalkon/CMakeLists.txt b/src/plugins/PyFalkon/CMakeLists.txt
index a2f4e420c..6b0f9b836 100644
--- a/src/plugins/PyFalkon/CMakeLists.txt
+++ b/src/plugins/PyFalkon/CMakeLists.txt
@@ -93,8 +93,28 @@ set(SHIBOKEN_OPTIONS --generator-set=shiboken --enable-parent-ctor-heuristic
 # Specify which sources will be generated by shiboken, and their dependencies.
 set(GENERATED_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/pyfalkon_module_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webview_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabbedwebview_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webpage_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webhittestresult_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/desktopfile_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/plugininterface_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/loadrequest_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/popupwebview_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/qz_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/desktopnotificationsfactory_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/externaljsobject_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/pluginproxy_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/plugins_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/plugins_plugin_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/pluginspec_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/qtsingleapplication_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/squeezelabelv1_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/squeezelabelv2_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/lineedit_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sidewidget_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webtab_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/mainapplication_wrapper.cpp
 )
 set(GENERATED_SOURCES_DEPENDENCIES
     ${WRAPPED_HEADER}
diff --git a/src/plugins/PyFalkon/pyfalkon.xml b/src/plugins/PyFalkon/pyfalkon.xml
index 18986183f..dfe2d32cf 100644
--- a/src/plugins/PyFalkon/pyfalkon.xml
+++ b/src/plugins/PyFalkon/pyfalkon.xml
@@ -6,10 +6,62 @@
       #include <pythonplugin.h>
     </inject-code>
 
+    <namespace-type name="Qz">
+      <enum-type name="BrowserWindowType"/>
+      <enum-type name="CommandLineAction"/>
+      <enum-type name="ObjectName"/>
+      <enum-type name="NewTabPositionFlag" flags="NewTabPositionFlags"/>
+    </namespace-type>
+
+    <object-type name="LineEdit">
+      <enum-type name="WidgetPosition"/>
+      <enum-type name="EditAction"/>
+    </object-type>
+    <object-type name="SideWidget"/>
+    <object-type name="SqueezeLabelV1"/>
+    <object-type name="SqueezeLabelV2"/>
+    <object-type name="QtSingleApplication">
+      <include file-name="qtsingleapplication/qtsingleapplication.h" location="global"/>
+      <modify-function signature="QtSingleApplication(int&amp;,char**,bool)" remove="all"/>
+      <modify-function signature="QtSingleApplication(QString,int&amp;,char**)" remove="all"/>
+    </object-type>
+    <value-type name="LoadRequest">
+      <enum-type name="Operation"/>
+    </value-type>
+    <object-type name="WebPage">
+      <enum-type name="JsWorld"/>
+      <modify-function signature="execJavaScript(QString,quint32,int)" remove="all"/>
+    </object-type>
+    <object-type name="WebView"/>
+    <object-type name="PopupWebView"/>
+    <object-type name="TabbedWebView"/>
+    <value-type name="WebHitTestResult"/>
+    <object-type name="WebTab">
+      <enum-type name="AddChildBehavior"/>
+    </object-type>
     <value-type name="DesktopFile"/>
     <object-type name="PluginInterface">
       <enum-type name="InitState"/>
     </object-type>
+    <object-type name="ExternalJsObject">
+      <include file-name="javascript/externaljsobject.h" location="global"/>
+    </object-type>
+    <object-type name="Plugins">
+      <value-type name="Plugin">
+        <enum-type name="Type"/>
+      </value-type>
+    </object-type>
+    <value-type name="PluginSpec"/>
+    <object-type name="PluginProxy">
+      <enum-type name="EventHandlerType"/>
+    </object-type>
+    <object-type name="DesktopNotificationsFactory">
+      <enum-type name="Type"/>
+    </object-type>
+    <object-type name="MainApplication">
+      <enum-type name="AfterLaunch"/>
+      <modify-function signature="MainApplication(int&amp;,char**)" remove="all"/>
+    </object-type>
 
     <add-function signature="registerPlugin(PluginInterface*)">
       <inject-code class="target" position="beginning">
diff --git a/src/plugins/PyFalkon/wrappedclasses.h b/src/plugins/PyFalkon/wrappedclasses.h
index a038af1f8..a7bc0dffb 100644
--- a/src/plugins/PyFalkon/wrappedclasses.h
+++ b/src/plugins/PyFalkon/wrappedclasses.h
@@ -16,6 +16,34 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 
-#include "webview.h"
-#include "desktopfile.h"
+// 3rdparty
+#include "lineedit.h"
+#include "squeezelabelv1.h"
+#include "squeezelabelv2.h"
+#include "qtsingleapplication/qtsingleapplication.h"
+
+// app
+#include "mainapplication.h"
+
+// notifications
+#include "desktopnotificationsfactory.h"
+
+// plugins
+#include "pluginproxy.h"
 #include "plugininterface.h"
+
+// popupwindow
+#include "popupwebview.h"
+
+// tools
+#include "desktopfile.h"
+
+// webengine
+#include "webpage.h"
+#include "webview.h"
+#include "loadrequest.h"
+#include "javascript/externaljsobject.h"
+
+// webtab
+#include "webtab.h"
+#include "tabbedwebview.h"