diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index e8534078..dbbad344 100644
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -22,9 +22,8 @@
 #if !defined( INCLUDED_GTKUTIL_ACCELERATOR_H )
 #define INCLUDED_GTKUTIL_ACCELERATOR_H
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkkeys.h>
 
 #include "generic/callback.h"
 
diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 87a0e615..58d3f2d4 100644
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -24,8 +24,7 @@
 #include "stream/textstream.h"
 
 #include <string.h>
-#include <gdk/gdkcursor.h>
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 
 #if 0
 GdkCursor* create_blank_cursor(){
diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 19fc1887..47c60bd8 100644
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -23,8 +23,8 @@
 #define INCLUDED_GTKUTIL_CURSOR_H
 
 #include <glib.h>
-#include <gdk/gdkevents.h>
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 
 #include "debugging/debugging.h"
 
diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index f3c4f670..3cd472b2 100644
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -45,7 +45,7 @@ void MultiMonitor_constructPreferences( PreferencesPage& page ){
 #include "preferencesystem.h"
 #include "stringio.h"
 
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 
 namespace
 {
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 1eaae36d..dbcaa450 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -78,8 +78,6 @@ void Mouse_registerPreferencesPage(){
    =========================================================
  */
 
-#include <map>
-
 inline const char* xmlAttr_getName( xmlAttrPtr attr ){
 	return reinterpret_cast<const char*>( attr->name );
 }
diff --git a/radiant/windowobservers.cpp b/radiant/windowobservers.cpp
index 83857e69..8738bf3a 100644
--- a/radiant/windowobservers.cpp
+++ b/radiant/windowobservers.cpp
@@ -22,7 +22,7 @@
 #include "windowobservers.h"
 
 #include <vector>
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>
 #include "generic/bitfield.h"
 
 namespace
diff --git a/radiant/windowobservers.h b/radiant/windowobservers.h
index af80136c..7b7a79d4 100644
--- a/radiant/windowobservers.h
+++ b/radiant/windowobservers.h
@@ -24,7 +24,7 @@
 
 #include "windowobserver.h"
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 #include "math/vector.h"