diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index bb6013b..afdccaf 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <typesystem package="PySide.QtNetwork">
-    <load-typesystem name="typesystem_templates.xml" generate="no" />
     <load-typesystem name="typesystem_core.xml" generate="no" />
 
     <namespace-type name="QSsl">
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index f653e65..2efa803 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -30,7 +30,7 @@ ${SPECIFIC_OS_FILES}
 ${QtSvg_46_SRC}
 )
 
-execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
+execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
diff --git a/PySide/QtSvg/typesystem_svg.xml b/PySide/QtSvg/typesystem_svg.xml
index f7932ba..5cc1b51 100644
--- a/PySide/QtSvg/typesystem_svg.xml
+++ b/PySide/QtSvg/typesystem_svg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <typesystem package="PySide.QtSvg">
-  <load-typesystem name="typesystem_gui.xml.in" generate="no"/>
-  
+  <load-typesystem name="typesystem_gui.xml" generate="no"/>
+
   <object-type name="QSvgRenderer" />
   <object-type name="QSvgWidget" />
 
@@ -11,7 +11,7 @@
           <reference-count action="add"/>
       </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="outputDevice() const">
       <modify-argument index="return">
           <define-ownership class="target" owner="default"/>
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index dc69d58..aae9bb9 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -18,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
 ${SPECIFIC_OS_FILES}
 )
 
-execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
+execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml
index 8e47ee1..428a8ee 100644
--- a/PySide/QtTest/typesystem_test.xml
+++ b/PySide/QtTest/typesystem_test.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <typesystem package="PySide.QtTest">
-  <load-typesystem name="typesystem_core.xml" generate="no"/>
-  <load-typesystem name="typesystem_gui.xml.in" generate="no"/> <!-- FIXME -->
+  <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
   <rejection class="QTest" function-name="qCompare&lt;char&gt;"/>
   <rejection class="QTest" function-name="qCompare&lt;char*&gt;"/>