diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 6d3871b7c2..75fe5ab896 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -6,7 +6,7 @@
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
-#endif
+
 
 #include <components/process/processinvoker.hpp>
 
@@ -14,7 +14,7 @@
 #include <components/config/launchersettings.hpp>
 
 #include <components/settings/settings.hpp>
-
+#endif
 #include "ui_mainwindow.h"
 
 class QListWidgetItem;
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index 69acfac3d1..bec2c68695 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -4,6 +4,8 @@
 #include <QDialog>
 #include <QModelIndex>
 
+#ifndef Q_MOC_RUN
+
 #include <boost/filesystem/path.hpp>
 #include "adjusterwidget.hpp"
 
@@ -12,6 +14,8 @@
 Q_DECLARE_METATYPE (boost::filesystem::path)
 #endif
 
+#endif
+
 #include "ui_filedialog.h"
 
 namespace ContentSelectorView
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index e1538e2439..5184f0f734 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -8,6 +8,7 @@
 #include <QWidget>
 #include <QEvent>
 
+#ifndef Q_MOC_RUN
 #include "../../model/world/data.hpp"
 #include "../../model/world/land.hpp"
 
@@ -15,6 +16,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/landtexture.hpp"
+#endif
 
 namespace CSVWidget
 {
diff --git a/apps/opencs/view/tools/merge.hpp b/apps/opencs/view/tools/merge.hpp
index d4ed7e34b8..e332b799f3 100644
--- a/apps/opencs/view/tools/merge.hpp
+++ b/apps/opencs/view/tools/merge.hpp
@@ -3,7 +3,9 @@
 
 #include <QWidget>
 
+#ifndef Q_MOC_RUN
 #include <boost/filesystem/path.hpp>
+#endif
 
 class QPushButton;
 class QListWidget;
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index 4669f432e1..80e9a93828 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -14,9 +14,11 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 
+#ifndef Q_MOC_RUN
 #include "scenetool.hpp"
 
 #include "../../model/doc/document.hpp"
+#endif
 
 class QTableWidget;
 
diff --git a/apps/opencs/view/world/creator.hpp b/apps/opencs/view/world/creator.hpp
index 0020fd3c85..f50333e4e4 100644
--- a/apps/opencs/view/world/creator.hpp
+++ b/apps/opencs/view/world/creator.hpp
@@ -5,10 +5,12 @@
 
 #include <QWidget>
 
+#ifndef Q_MOC_RUN
 #include "../../model/doc/document.hpp"
 
 #include "../../model/world/scope.hpp"
 #include "../../model/world/universalid.hpp"
+#endif
 
 namespace CSMDoc
 {
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index cbcb9b2108..52d3d8da5d 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -8,11 +8,13 @@
 #include <QAbstractItemDelegate>
 #include <QScrollArea>
 
+#ifndef Q_MOC_RUN
 #include "../doc/subview.hpp"
 
 #include "../../model/world/columnbase.hpp"
 #include "../../model/world/commanddispatcher.hpp"
 #include "../../model/world/universalid.hpp"
+#endif
 
 class QDataWidgetMapper;
 class QSize;
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
index 766d729588..ebd5c0ad7a 100644
--- a/apps/opencs/view/world/util.hpp
+++ b/apps/opencs/view/world/util.hpp
@@ -6,8 +6,11 @@
 #include <QAbstractTableModel>
 #include <QStyledItemDelegate>
 
+
+#ifndef Q_MOC_RUN
 #include "../../model/world/columnbase.hpp"
 #include "../../model/doc/document.hpp"
+#endif
 
 class QUndoStack;
 
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 7f6e48a876..a05013d986 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -9,9 +9,10 @@
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
-#endif
+
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
+#endif
 
 namespace Wizard
 {