diff --git a/src/noggit/Misc.cpp b/src/noggit/Misc.cpp
index 8c021670..48c9c178 100755
--- a/src/noggit/Misc.cpp
+++ b/src/noggit/Misc.cpp
@@ -5,6 +5,7 @@
 #include <noggit/ModelInstance.h>
 #include <noggit/WMOInstance.h>
 #include <ClientData.hpp>
+#include <math/bounding_box.hpp>
 
 #include <iomanip>
 #include <map>
diff --git a/src/noggit/Misc.h b/src/noggit/Misc.h
index 36e7ecbe..a491a28d 100755
--- a/src/noggit/Misc.h
+++ b/src/noggit/Misc.h
@@ -12,6 +12,7 @@
 #include <vector>
 #include <glm/vec4.hpp>
 #include <glm/vec2.hpp>
+#include <glm/mat4x4.hpp>
 #include <noggit/Selection.h>
 #include <util/sExtendableArray.hpp>
 
diff --git a/src/noggit/World.cpp b/src/noggit/World.cpp
index 3c9c1717..3d23d535 100755
--- a/src/noggit/World.cpp
+++ b/src/noggit/World.cpp
@@ -21,6 +21,8 @@
 #include <noggit/application/NoggitApplication.hpp>
 #include <noggit/project/CurrentProject.hpp>
 #include <noggit/ActionManager.hpp>
+#include <math/bounding_box.hpp>
+
 #include <external/tracy/Tracy.hpp>
 #include <QByteArray>
 #include <QImage>
diff --git a/src/noggit/texture_set.cpp b/src/noggit/texture_set.cpp
index a6d19627..cb19fa8e 100755
--- a/src/noggit/texture_set.cpp
+++ b/src/noggit/texture_set.cpp
@@ -1473,11 +1473,11 @@ void TextureSet::updateDoodadMapping()
             {
                 for (int y = 0; y < 8; y++)
                 {
-                    unsigned int base_alpha = 255;
+                    int base_alpha = 255;
 
                     for (int alpha_layer = 0; alpha_layer < (nTextures - 1); ++alpha_layer)
                     {
-                        auto alpha = static_cast<int>(alphamaps[alpha_layer]->getAlpha((unit_y * 8 + y) * 64 + (unit_x * 8 + x)));
+                        int alpha = static_cast<int>(alphamaps[alpha_layer]->getAlpha((unit_y * 8 + y) * 64 + (unit_x * 8 + x)));
 
                         layer_totals[alpha_layer+1] += alpha;