diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
index 5e3f237b..d882ea6a 100644
--- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
+++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
@@ -29,6 +29,7 @@
 
 #include <QtGui>
 #include <QtXml>
+#include <QDesktopWidget>
 
 #include "core/UBSettings.h"
 #include "core/UBApplication.h"
diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h
index 3314ac6b..21f993b2 100644
--- a/src/adaptors/publishing/UBDocumentPublisher.h
+++ b/src/adaptors/publishing/UBDocumentPublisher.h
@@ -30,6 +30,13 @@
 
 #include <QtGui>
 #include <QtNetwork>
+#include <QDialog>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTextEdit>
 
 typedef struct
 {
diff --git a/src/api/UBLibraryAPI.h b/src/api/UBLibraryAPI.h
index 3164e440..ba9a547a 100644
--- a/src/api/UBLibraryAPI.h
+++ b/src/api/UBLibraryAPI.h
@@ -30,6 +30,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QWebView>
 
 class UBLibraryAPI : public QObject
 {
diff --git a/src/api/UBWidgetMessageAPI.cpp b/src/api/UBWidgetMessageAPI.cpp
index d8c2ac48..9d6c6aba 100644
--- a/src/api/UBWidgetMessageAPI.cpp
+++ b/src/api/UBWidgetMessageAPI.cpp
@@ -23,7 +23,7 @@
  */
 
 
-
+#include <QWebFrame>
 
 #include "UBWidgetMessageAPI.h"
 
diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h
index 970665e4..4d796656 100644
--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@@ -31,6 +31,9 @@
 #include <QtGui>
 
 #include <QObject>
+#include <QHBoxLayout>
+#include <QUndoCommand>
+
 #include "document/UBDocumentContainer.h"
 #include "core/UBApplicationController.h"
 
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index c1074710..52337eb1 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -43,6 +43,7 @@
 #include <QThread>
 #include <QMutex>
 #include <QWaitCondition>
+#include <QListView>
 
 class UBFeaturesModel;
 class UBFeaturesItemDelegate;
diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h
index 7a531d0f..7ed30602 100644
--- a/src/core/UBApplication.h
+++ b/src/core/UBApplication.h
@@ -31,6 +31,7 @@
 #include <QtGui>
 #include <QUndoStack>
 #include <QToolBar>
+#include <QMenu>
 
 #include "qtsingleapplication.h"
 
diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h
index 96b64fed..fa15b255 100644
--- a/src/core/UBPreferencesController.h
+++ b/src/core/UBPreferencesController.h
@@ -29,6 +29,7 @@
 #define UBPREFERENCESCONTROLLER_H_
 
 #include <QtGui>
+#include <QDialog>
 
 class UBColorPicker;
 class UBApplication;
diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h
index 3d84b09a..ab2633fe 100644
--- a/src/domain/UBGraphicsWidgetItem.h
+++ b/src/domain/UBGraphicsWidgetItem.h
@@ -31,6 +31,7 @@
 #include <QtGui>
 #include <QtWebKit>
 #include <QDomElement>
+#include <QGraphicsWebView>
 
 #include "core/UB.h"
 
diff --git a/src/frameworks/UBCoreGraphicsScene.h b/src/frameworks/UBCoreGraphicsScene.h
index 38de69eb..281ac820 100644
--- a/src/frameworks/UBCoreGraphicsScene.h
+++ b/src/frameworks/UBCoreGraphicsScene.h
@@ -29,6 +29,8 @@
 #define UBCOREGRAPHICSSCENE_H_
 
 #include <QtGui>
+#include <QGraphicsScene>
+#include <QGraphicsItem>
 
 class UBCoreGraphicsScene : public QGraphicsScene
 {
diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h
index b82f564a..d7292a00 100644
--- a/src/web/UBWebController.h
+++ b/src/web/UBWebController.h
@@ -30,6 +30,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QWebView>
 
 #include "UBOEmbedParser.h"