diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 571cc91..f1c4cf2 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -128,13 +128,10 @@
   <primitive-type name="signed long" default-constructor="0"/>
   <primitive-type name="long"/>
   <primitive-type name="unsigned long" default-constructor="0"/>
-  <primitive-type name="WId">
-    <!-- FIXME This is a workaround to include some headers needed by some includes (nothing to do with QBool) -->
-    <include file-name="signalmanager.h" location="global"/>
-  </primitive-type>
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
     <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
-      <include file-name="QTextDocument" location="global"/>
+    <include file-name="signalmanager.h" location="global"/>
+    <include file-name="QTextDocument" location="global"/>
   </primitive-type>
   <primitive-type name="QBool" target-lang-api-name="PyBool">
     <conversion-rule file="qbool_conversions.h"/>
diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml
index 0dfb504..f44d3d4 100644
--- a/PySide/QtGui/typesystem_gui_win.xml
+++ b/PySide/QtGui/typesystem_gui_win.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <typesystem package="PySide.QtGui">
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
-
+  <enum-type name="QPixmap::HBitmapFormat" />
   <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/global.h.in b/PySide/global.h.in
index c9c8ba8..cf21bd6 100644
--- a/PySide/global.h.in
+++ b/PySide/global.h.in
@@ -345,7 +345,7 @@ QT_END_HEADER
 #define QT_NO_DEBUG
 
 #include <QtCore/QtCore>
-#if @ENABLE_MAC@
+#if @ENABLE_MAC@ || @ENABLE_WIN@
   #undef qdoc
 #endif
 #include <QtGui/QtGui>