only #include <gdk/gdk.h> <gdk/gdkwin32.h> <gdk/gdkx.h> <gdk/gdkkeysyms.h>

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"
 

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(){

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"
 

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
 {

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 );
 }

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

radiant/windowobservers.h

@@ -24,7 +24,7 @@
 
 #include "windowobserver.h"
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 #include "math/vector.h"