diff --git a/src/mysql/mysql.cpp b/src/mysql/mysql.cpp
index bda77be8..4839e39c 100755
--- a/src/mysql/mysql.cpp
+++ b/src/mysql/mysql.cpp
@@ -3,7 +3,8 @@
 #include <mysql/mysql.h>
 #include <noggit/world.h>
 
-#include <QtCore/QSettings>
+#include <QSettings>
+#include <QMessageBox>
 
 #include <cppconn/driver.h>
 #include <cppconn/prepared_statement.h>
diff --git a/src/noggit/map_horizon.h b/src/noggit/map_horizon.h
index 8ff2d5a0..8aa0ce1f 100755
--- a/src/noggit/map_horizon.h
+++ b/src/noggit/map_horizon.h
@@ -5,6 +5,8 @@
 #include <math/frustum.hpp>
 
 #include <noggit/tool_enums.hpp>
+#include <noggit/WMO.h>
+#include <noggit/MapHeaders.h>
 
 #include <opengl/texture.hpp>
 #include <opengl/scoped.hpp>
diff --git a/src/noggit/ui/ObjectEditor.cpp b/src/noggit/ui/ObjectEditor.cpp
index fed5944e..ee9089dd 100644
--- a/src/noggit/ui/ObjectEditor.cpp
+++ b/src/noggit/ui/ObjectEditor.cpp
@@ -16,9 +16,10 @@
 #include <noggit/ui/ModelImport.h>
 #include <noggit/ui/ObjectEditor.h>
 #include <noggit/ui/RotationEditor.h>
+#include <noggit/ui/FontNoggit.hpp>
 #include <noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.hpp>
 #include <noggit/ui/tools/UiCommon/expanderwidget.h>
-#include <noggit/WMOInstance.h> // WMOInstance
+#include <noggit/WMOInstance.h>
 #include <noggit/World.h>
 
 #include <QButtonGroup>
@@ -30,8 +31,10 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QToolButton>
 #include <QLineEdit>
 #include <QSettings>
+#include <QApplication>
 #include <QtWidgets/qcombobox.h>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/qgroupbox.h>
diff --git a/src/noggit/ui/ObjectEditor.h b/src/noggit/ui/ObjectEditor.h
index 991a51d3..5d02edbc 100755
--- a/src/noggit/ui/ObjectEditor.h
+++ b/src/noggit/ui/ObjectEditor.h
@@ -13,6 +13,7 @@ class QGroupBox;
 class QLabel;
 class QSettings;
 class QSlider;
+class QToolButton;
 class QLineEdit;
 class World;