diff --git a/src/Gui/CombiView.cpp b/src/Gui/CombiView.cpp
index 8df9c34c49a0..29f08572a93a 100644
--- a/src/Gui/CombiView.cpp
+++ b/src/Gui/CombiView.cpp
@@ -27,7 +27,6 @@
 
 #include "CombiView.h"
 #include "BitmapFactory.h"
-#include "iisTaskPanel/include/iisTaskPanel"
 #include "PropertyView.h"
 #include "ProjectView.h"
 #include "Application.h"
diff --git a/src/Gui/Control.h b/src/Gui/Control.h
index d9c589096a9a..e95db545354e 100644
--- a/src/Gui/Control.h
+++ b/src/Gui/Control.h
@@ -32,6 +32,8 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 
+class QTabWidget;
+
 namespace App
 {
   class DocumentObject;
diff --git a/src/Gui/Qt4All.h b/src/Gui/Qt4All.h
index a64b31bc9a06..3db34caf9673 100644
--- a/src/Gui/Qt4All.h
+++ b/src/Gui/Qt4All.h
@@ -108,6 +108,7 @@
 #include <qradiobutton.h>
 #include <QScrollArea>
 #include <qscrollbar.h>
+#include <QSessionManager>
 #include <QSettings>
 #include <QShortcut>
 #include <qslider.h>
diff --git a/src/Gui/TaskView/TaskDialog.h b/src/Gui/TaskView/TaskDialog.h
index 367a175f0f1d..67a25f514173 100644
--- a/src/Gui/TaskView/TaskDialog.h
+++ b/src/Gui/TaskView/TaskDialog.h
@@ -30,7 +30,6 @@
 
 #include <QDialogButtonBox>
 
-#include <Gui/iisTaskPanel/include/iisTaskPanel>
 #include <Gui/Selection.h>
 
 namespace App {
diff --git a/src/Gui/TaskView/TaskWatcher.h b/src/Gui/TaskView/TaskWatcher.h
index df7bdbf7f28f..bf02bfafccf8 100644
--- a/src/Gui/TaskView/TaskWatcher.h
+++ b/src/Gui/TaskView/TaskWatcher.h
@@ -29,7 +29,6 @@
 #include <vector>
 #include <QObject>
 
-#include <Gui/iisTaskPanel/include/iisTaskPanel>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
 
diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index f8ddeb7d828f..788c88e5f7df 100755
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <QApplication>
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
index 3664c1d40fe1..760bb20ed8c9 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
@@ -25,7 +25,9 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <QAction>
 # include <QCoreApplication>
+# include <QMenu>
 #endif
 
 #include "ViewProviderFemMeshShapeNetgen.h"
diff --git a/src/Mod/Spreadsheet/Gui/Workbench.h b/src/Mod/Spreadsheet/Gui/Workbench.h
index 6d6240b256d0..53c03a8fe0c1 100644
--- a/src/Mod/Spreadsheet/Gui/Workbench.h
+++ b/src/Mod/Spreadsheet/Gui/Workbench.h
@@ -28,6 +28,7 @@
 #include <Gui/Workbench.h>
 
 class QtColorPicker;
+class QColor;
 
 namespace SpreadsheetGui {