diff --git a/rtgui/inspector.cc b/rtgui/inspector.cc
index d38239cde..9002cc389 100644
--- a/rtgui/inspector.cc
+++ b/rtgui/inspector.cc
@@ -25,6 +25,7 @@
 #include "pathutils.h"
 #include "rtscalable.h"
 #include "../rtengine/previewimage.h"
+#include "../rtengine/rt_math.h"
 
 InspectorBuffer::InspectorBuffer(const Glib::ustring &imagePath) : currTransform(0), fromRaw(false)
 {
diff --git a/rtgui/inspector.h b/rtgui/inspector.h
index bb144834a..8338259bf 100644
--- a/rtgui/inspector.h
+++ b/rtgui/inspector.h
@@ -24,7 +24,6 @@
 
 #include "../rtengine/coord.h"
 #include "../rtengine/coord2d.h"
-#include "../rtengine/rt_math.h"
 
 class InspectorBuffer
 {
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index 9832b5730..2774cd206 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -18,6 +18,7 @@
 
 #include <glibmm/ustring.h>
 
+#include "inspector.h"
 #include "multilangmgr.h"
 #include "options.h"
 #include "rtscalable.h"
diff --git a/rtgui/thumbbrowserbase.h b/rtgui/thumbbrowserbase.h
index a5c51cf5f..5a55aeeca 100644
--- a/rtgui/thumbbrowserbase.h
+++ b/rtgui/thumbbrowserbase.h
@@ -23,13 +23,15 @@
 #include <gtkmm.h>
 
 #include "guiutils.h"
-#include "inspector.h"
 #include "options.h"
 #include "thumbbrowserentrybase.h"
 
 /*
  * Class handling the list of ThumbBrowserEntry objects and their position in it's allocated space
  */
+
+class Inspector;
+
 class ThumbBrowserBase :
     public Gtk::Grid
 {
diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc
index 12059c72e..3840c8bf9 100644
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -20,6 +20,7 @@
 
 #include "options.h"
 #include "thumbbrowserbase.h"
+#include "../rtengine/rt_math.h"
 
 namespace
 {