6 files changed, 6 insertions, 10 deletions
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index e4ff09829..5494aaaeb 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -17,10 +17,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include "helper/sp-marshal.h"
 #include "helper/units.h"
 #include "helper/unit-menu.h"
diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
index b3ab8836c..795dda7b7 100644
--- a/src/helper/unit-menu.h
+++ b/src/helper/unit-menu.h
@@ -11,7 +11,7 @@
  */
 
 #include <glib/gtypes.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 #include <helper/helper-forward.h>
 
diff --git a/src/helper/unit-tracker.cpp b/src/helper/unit-tracker.cpp
index 3f5a72e6a..609c2f292 100644
--- a/src/helper/unit-tracker.cpp
+++ b/src/helper/unit-tracker.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "unit-tracker.h"
 #include "ege-select-one-action.h"
diff --git a/src/helper/unit-tracker.h b/src/helper/unit-tracker.h
index 0f333b2ec..a15a0a6ca 100644
--- a/src/helper/unit-tracker.h
+++ b/src/helper/unit-tracker.h
@@ -15,8 +15,7 @@
 
 #include <map>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "helper/units.h"
 
diff --git a/src/helper/window.cpp b/src/helper/window.cpp
index b814424e5..f4640203d 100644
--- a/src/helper/window.cpp
+++ b/src/helper/window.cpp
@@ -12,7 +12,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 #include "inkscape.h"
diff --git a/src/helper/window.h b/src/helper/window.h
index 36b91a813..dc2c48bc0 100644
--- a/src/helper/window.h
+++ b/src/helper/window.h
@@ -10,7 +10,7 @@
  * This code is in public domain
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 /*