From 733ec8a931094f120a9923882b0eb592c45595fc Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 17 Feb 2016 19:40:18 +1100
Subject: [PATCH] -DGTK_DISABLE_SINGLE_INCLUDES

---
 CMakeLists.txt                 |  2 ++
 contrib/brushexport/plugin.cpp |  1 -
 libs/gtkutil/accelerator.cpp   |  3 +--
 libs/gtkutil/accelerator.h     |  4 +---
 libs/gtkutil/button.cpp        |  2 +-
 libs/gtkutil/clipboard.cpp     |  2 +-
 libs/gtkutil/container.h       |  2 +-
 libs/gtkutil/cursor.cpp        |  3 +--
 libs/gtkutil/cursor.h          |  4 +---
 libs/gtkutil/dialog.cpp        | 11 +----------
 libs/gtkutil/dialog.h          |  2 +-
 libs/gtkutil/entry.h           |  2 +-
 libs/gtkutil/filechooser.cpp   |  6 +-----
 libs/gtkutil/frame.cpp         |  2 +-
 libs/gtkutil/glwidget.cpp      |  2 +-
 libs/gtkutil/image.cpp         |  3 +--
 libs/gtkutil/menu.cpp          |  6 +-----
 libs/gtkutil/messagebox.cpp    | 10 +---------
 libs/gtkutil/nonmodal.h        |  6 ++----
 libs/gtkutil/paned.cpp         |  3 +--
 libs/gtkutil/toolbar.cpp       |  3 +--
 libs/gtkutil/widget.h          |  2 +-
 libs/gtkutil/window.cpp        |  2 +-
 libs/gtkutil/window.h          |  2 +-
 libs/gtkutil/xorrectangle.h    |  2 +-
 radiant/brushmanip.cpp         |  7 ++++---
 radiant/build.cpp              |  9 +--------
 radiant/camwindow.cpp          | 13 +++++++------
 radiant/commands.cpp           | 34 ++++++++++++++++------------------
 radiant/console.cpp            |  5 +----
 radiant/dialog.cpp             | 13 +------------
 radiant/entityinspector.cpp    | 17 +----------------
 radiant/entitylist.cpp         |  5 +----
 radiant/feedback.cpp           |  7 +------
 radiant/findtexturedialog.cpp  | 12 +-----------
 radiant/groupdialog.cpp        |  6 +-----
 radiant/gtkdlgs.cpp            | 17 +----------------
 radiant/gtkmisc.cpp            |  3 +--
 radiant/gtkmisc.h              |  2 +-
 radiant/main.cpp               |  2 +-
 radiant/mainframe.cpp          |  8 +-------
 radiant/map.cpp                | 15 ++++-----------
 radiant/mru.cpp                |  2 +-
 radiant/multimon.cpp           |  2 +-
 radiant/patchdialog.cpp        | 10 +---------
 radiant/patchmanip.cpp         | 16 ++++++----------
 radiant/pluginmenu.cpp         |  3 +--
 radiant/plugintoolbar.cpp      |  2 +-
 radiant/preferences.cpp        | 15 +--------------
 radiant/qe3.cpp                |  2 +-
 radiant/select.cpp             |  5 +----
 radiant/surfacedialog.cpp      |  9 +--------
 radiant/textureentry.h         |  3 +--
 radiant/texwindow.cpp          |  5 -----
 radiant/treemodel.cpp          |  4 +---
 radiant/watchbsp.cpp           |  2 +-
 radiant/windowobservers.cpp    |  2 +-
 radiant/windowobservers.h      |  2 +-
 radiant/xywindow.cpp           | 18 +++++++++---------
 59 files changed, 99 insertions(+), 265 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a39ab7ab..70c60542 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,8 @@ find_package(OpenGL REQUIRED)
 
 add_definitions(-DRADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}")
 
+add_definitions(-DGTK_DISABLE_SINGLE_INCLUDES)
+
 if(NOT WIN32)
     add_definitions(
         -DPOSIX=1
diff --git a/contrib/brushexport/plugin.cpp b/contrib/brushexport/plugin.cpp
index 49b3df06..8e498987 100644
--- a/contrib/brushexport/plugin.cpp
+++ b/contrib/brushexport/plugin.cpp
@@ -24,7 +24,6 @@
 #include "qerplugin.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreeview.h>
 
 #include "debugging/debugging.h"
 #include "string/string.h"
diff --git a/libs/gtkutil/accelerator.cpp b/libs/gtkutil/accelerator.cpp
index 3b9924f9..c80d982a 100644
--- a/libs/gtkutil/accelerator.cpp
+++ b/libs/gtkutil/accelerator.cpp
@@ -25,8 +25,7 @@
 
 #include <map>
 #include <set>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 #include "generic/bitfield.h"
diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index d1cd344e..a02572e7 100644
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -22,9 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_ACCELERATOR_H )
 #define INCLUDED_GTKUTIL_ACCELERATOR_H
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkkeys.h>
+#include <gdk/gdk.h>
 
 #include "generic/callback.h"
 
diff --git a/libs/gtkutil/button.cpp b/libs/gtkutil/button.cpp
index fc1e58d7..d565c974 100644
--- a/libs/gtkutil/button.cpp
+++ b/libs/gtkutil/button.cpp
@@ -21,7 +21,7 @@
 
 #include "button.h"
 
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 #include "stream/textstream.h"
 #include "stream/stringstream.h"
diff --git a/libs/gtkutil/clipboard.cpp b/libs/gtkutil/clipboard.cpp
index c8073aba..0d96b3fb 100644
--- a/libs/gtkutil/clipboard.cpp
+++ b/libs/gtkutil/clipboard.cpp
@@ -83,7 +83,7 @@ void clipboard_paste( ClipboardPasteFunc paste ){
 
 #else
 
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 enum
 {
diff --git a/libs/gtkutil/container.h b/libs/gtkutil/container.h
index b6b6afa4..e633d81c 100644
--- a/libs/gtkutil/container.h
+++ b/libs/gtkutil/container.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_CONTAINER_H )
 #define INCLUDED_GTKUTIL_CONTAINER_H
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 inline GtkWidget* container_add_widget( GtkContainer* container, GtkWidget* widget ){
 	gtk_container_add( container, widget );
diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index f0538a50..287b97de 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>
 
 
 GdkCursor* create_blank_cursor(){
diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index dfcc962c..4e7d4fac 100644
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -23,9 +23,7 @@
 #define INCLUDED_GTKUTIL_CURSOR_H
 
 #include <glib.h>
-#include <gdk/gdkevents.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "debugging/debugging.h"
 
diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 17b9ac7a..fce53163 100644
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -21,16 +21,7 @@
 
 #include "dialog.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include "button.h"
 #include "window.h"
diff --git a/libs/gtkutil/dialog.h b/libs/gtkutil/dialog.h
index 5a87731e..b3e5017c 100644
--- a/libs/gtkutil/dialog.h
+++ b/libs/gtkutil/dialog.h
@@ -25,7 +25,7 @@
 #include "generic/callback.h"
 #include "generic/arrayrange.h"
 #include "qerplugin.h"
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 typedef int gint;
 typedef gint gboolean;
diff --git a/libs/gtkutil/entry.h b/libs/gtkutil/entry.h
index 972514d0..821659c1 100644
--- a/libs/gtkutil/entry.h
+++ b/libs/gtkutil/entry.h
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <cstdlib>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 inline void entry_set_string( GtkEntry* entry, const char* string ){
 	gtk_entry_set_text( entry, string );
diff --git a/libs/gtkutil/filechooser.cpp b/libs/gtkutil/filechooser.cpp
index 92bc5e6c..177e752e 100644
--- a/libs/gtkutil/filechooser.cpp
+++ b/libs/gtkutil/filechooser.cpp
@@ -25,11 +25,7 @@
 
 #include <list>
 #include <vector>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "string/string.h"
diff --git a/libs/gtkutil/frame.cpp b/libs/gtkutil/frame.cpp
index 53fb462d..87f75f36 100644
--- a/libs/gtkutil/frame.cpp
+++ b/libs/gtkutil/frame.cpp
@@ -21,7 +21,7 @@
 
 #include "frame.h"
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 GtkFrame* create_framed_widget( GtkWidget* widget ){
diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp
index 746b8f0f..1c9c275b 100644
--- a/libs/gtkutil/glwidget.cpp
+++ b/libs/gtkutil/glwidget.cpp
@@ -27,7 +27,7 @@
 
 #include "igl.h"
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkglwidget.h>
 
 #include "pointer.h"
diff --git a/libs/gtkutil/image.cpp b/libs/gtkutil/image.cpp
index 63a6d744..4b91bd25 100644
--- a/libs/gtkutil/image.cpp
+++ b/libs/gtkutil/image.cpp
@@ -21,8 +21,7 @@
 
 #include "image.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "string/string.h"
 #include "stream/stringstream.h"
diff --git a/libs/gtkutil/menu.cpp b/libs/gtkutil/menu.cpp
index 5dfad4c1..1cdc373a 100644
--- a/libs/gtkutil/menu.cpp
+++ b/libs/gtkutil/menu.cpp
@@ -22,11 +22,7 @@
 #include "menu.h"
 
 #include <ctype.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtkaccellabel.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "generic/callback.h"
diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp
index d07deddc..ae0f24d7 100644
--- a/libs/gtkutil/messagebox.cpp
+++ b/libs/gtkutil/messagebox.cpp
@@ -22,15 +22,7 @@
 #include "messagebox.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "dialog.h"
 #include "widget.h"
diff --git a/libs/gtkutil/nonmodal.h b/libs/gtkutil/nonmodal.h
index 864779bd..d251ca4c 100644
--- a/libs/gtkutil/nonmodal.h
+++ b/libs/gtkutil/nonmodal.h
@@ -22,9 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_NONMODAL_H )
 #define INCLUDED_GTKUTIL_NONMODAL_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "generic/callback.h"
@@ -36,7 +34,7 @@ typedef struct _GtkEntry GtkEntry;
 
 
 inline gboolean escape_clear_focus_widget( GtkWidget* widget, GdkEventKey* event, gpointer data ){
-	if ( event->keyval == GDK_Escape ) {
+	if ( event->keyval == GDK_KEY_Escape ) {
 		gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), NULL );
 		return TRUE;
 	}
diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index ec83344d..446a8bb4 100644
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -21,8 +21,7 @@
 
 #include "paned.h"
 
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "frame.h"
diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index ef7c99a4..7b32ae0e 100644
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -21,8 +21,7 @@
 
 #include "toolbar.h"
 
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "generic/callback.h"
diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h
index ceb92409..4e83e895 100644
--- a/libs/gtkutil/widget.h
+++ b/libs/gtkutil/widget.h
@@ -23,7 +23,7 @@
 #define INCLUDED_GTKUTIL_WIDGET_H
 
 #include <list>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "generic/callback.h"
 #include "warnings.h"
 #include "debugging/debugging.h"
diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index 2c34e509..b7be2d0e 100644
--- a/libs/gtkutil/window.cpp
+++ b/libs/gtkutil/window.cpp
@@ -21,7 +21,7 @@
 
 #include "window.h"
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "pointer.h"
diff --git a/libs/gtkutil/window.h b/libs/gtkutil/window.h
index 1a7161e6..96b9be00 100644
--- a/libs/gtkutil/window.h
+++ b/libs/gtkutil/window.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_WINDOW_H )
 #define INCLUDED_GTKUTIL_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "debugging/debugging.h"
 #include "generic/callback.h"
diff --git a/libs/gtkutil/xorrectangle.h b/libs/gtkutil/xorrectangle.h
index 35d72e5f..52d4c6e8 100644
--- a/libs/gtkutil/xorrectangle.h
+++ b/libs/gtkutil/xorrectangle.h
@@ -22,7 +22,7 @@
 #if !defined ( INCLUDED_XORRECTANGLE_H )
 #define INCLUDED_XORRECTANGLE_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 #include "math/vector.h"
 
diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp
index de5dca55..9056be4f 100644
--- a/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@ -36,6 +36,7 @@
 #include "preferences.h"
 
 #include <list>
+#include <gdk/gdkkeysyms.h>
 
 void Brush_ConstructCuboid( Brush& brush, const AABB& bounds, const char* shader, const TextureProjection& projection ){
 	const unsigned char box[3][2] = { { 0, 1 }, { 2, 0 }, { 1, 2 } };
@@ -1367,9 +1368,9 @@ void Brush_registerCommands(){
 	GlobalCommands_insert( "Brush8Sided", BrushMakeSided::SetCaller( g_brushmakesided8 ), Accelerator( '8', (GdkModifierType)GDK_CONTROL_MASK ) );
 	GlobalCommands_insert( "Brush9Sided", BrushMakeSided::SetCaller( g_brushmakesided9 ), Accelerator( '9', (GdkModifierType)GDK_CONTROL_MASK ) );
 
-	GlobalCommands_insert( "ClipSelected", FreeCaller<ClipSelected>(), Accelerator( GDK_Return ) );
-	GlobalCommands_insert( "SplitSelected", FreeCaller<SplitSelected>(), Accelerator( GDK_Return, (GdkModifierType)GDK_SHIFT_MASK ) );
-	GlobalCommands_insert( "FlipClip", FreeCaller<FlipClipper>(), Accelerator( GDK_Return, (GdkModifierType)GDK_CONTROL_MASK ) );
+	GlobalCommands_insert( "ClipSelected", FreeCaller<ClipSelected>(), Accelerator( GDK_KEY_Return ) );
+	GlobalCommands_insert( "SplitSelected", FreeCaller<SplitSelected>(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_SHIFT_MASK ) );
+	GlobalCommands_insert( "FlipClip", FreeCaller<FlipClipper>(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_CONTROL_MASK ) );
 
 	GlobalCommands_insert( "MakeDetail", FreeCaller<Select_MakeDetail>(), Accelerator( 'M', (GdkModifierType)GDK_CONTROL_MASK ) );
 	GlobalCommands_insert( "MakeStructural", FreeCaller<Select_MakeStructural>(), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
diff --git a/radiant/build.cpp b/radiant/build.cpp
index 03ebf652..0e85d942 100644
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -634,14 +634,7 @@ void build_commands_write( const char* filename ){
 
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/dialog.h"
 #include "gtkutil/closure.h"
diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 54c79647..542d019d 100644
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -25,6 +25,7 @@
 // Leonardo Zide (leo@lokigames.com)
 //
 
+#include <gdk/gdkkeysyms.h>
 #include "camwindow.h"
 
 #include "debugging/debugging.h"
@@ -911,27 +912,27 @@ void KeyEvent_disconnect( const char* name ){
 }
 
 void CamWnd_registerCommands( CamWnd& camwnd ){
-	GlobalKeyEvents_insert( "CameraForward", Accelerator( GDK_Up ),
+	GlobalKeyEvents_insert( "CameraForward", Accelerator( GDK_KEY_Up ),
 							ReferenceCaller<camera_t, Camera_MoveForward_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_MoveForward_KeyUp>( camwnd.getCamera() )
 							);
-	GlobalKeyEvents_insert( "CameraBack", Accelerator( GDK_Down ),
+	GlobalKeyEvents_insert( "CameraBack", Accelerator( GDK_KEY_Down ),
 							ReferenceCaller<camera_t, Camera_MoveBack_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_MoveBack_KeyUp>( camwnd.getCamera() )
 							);
-	GlobalKeyEvents_insert( "CameraLeft", Accelerator( GDK_Left ),
+	GlobalKeyEvents_insert( "CameraLeft", Accelerator( GDK_KEY_Left ),
 							ReferenceCaller<camera_t, Camera_RotateLeft_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_RotateLeft_KeyUp>( camwnd.getCamera() )
 							);
-	GlobalKeyEvents_insert( "CameraRight", Accelerator( GDK_Right ),
+	GlobalKeyEvents_insert( "CameraRight", Accelerator( GDK_KEY_Right ),
 							ReferenceCaller<camera_t, Camera_RotateRight_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_RotateRight_KeyUp>( camwnd.getCamera() )
 							);
-	GlobalKeyEvents_insert( "CameraStrafeRight", Accelerator( GDK_period ),
+	GlobalKeyEvents_insert( "CameraStrafeRight", Accelerator( GDK_KEY_period ),
 							ReferenceCaller<camera_t, Camera_MoveRight_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_MoveRight_KeyUp>( camwnd.getCamera() )
 							);
-	GlobalKeyEvents_insert( "CameraStrafeLeft", Accelerator( GDK_comma ),
+	GlobalKeyEvents_insert( "CameraStrafeLeft", Accelerator( GDK_KEY_comma ),
 							ReferenceCaller<camera_t, Camera_MoveLeft_KeyDown>( camwnd.getCamera() ),
 							ReferenceCaller<camera_t, Camera_MoveLeft_KeyUp>( camwnd.getCamera() )
 							);
diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index 4232549c..d904368e 100644
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -27,8 +27,7 @@
 #include "string/string.h"
 #include "versionlib.h"
 #include "gtkutil/messagebox.h"
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include "gtkmisc.h"
 
 typedef std::pair<Accelerator, int> ShortcutValue; // accelerator, isRegistered
@@ -148,9 +147,8 @@ void connect_accelerator( const char *name ){
 }
 
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
 #include <uilib/uilib.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gtkutil/dialog.h"
 #include "mainframe.h"
@@ -247,20 +245,20 @@ bool accelerator_window_key_press( ui::Widget widget, GdkEventKey *event, gpoint
 #else
 	switch ( event->keyval )
 	{
-	case GDK_Shift_L:
-	case GDK_Shift_R:
-	case GDK_Control_L:
-	case GDK_Control_R:
-	case GDK_Caps_Lock:
-	case GDK_Shift_Lock:
-	case GDK_Meta_L:
-	case GDK_Meta_R:
-	case GDK_Alt_L:
-	case GDK_Alt_R:
-	case GDK_Super_L:
-	case GDK_Super_R:
-	case GDK_Hyper_L:
-	case GDK_Hyper_R:
+	case GDK_KEY_Shift_L:
+	case GDK_KEY_Shift_R:
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
+	case GDK_KEY_Caps_Lock:
+	case GDK_KEY_Shift_Lock:
+	case GDK_KEY_Meta_L:
+	case GDK_KEY_Meta_R:
+	case GDK_KEY_Alt_L:
+	case GDK_KEY_Alt_R:
+	case GDK_KEY_Super_L:
+	case GDK_KEY_Super_R:
+	case GDK_KEY_Hyper_L:
+	case GDK_KEY_Hyper_R:
 		return false;
 	}
 #endif
diff --git a/radiant/console.cpp b/radiant/console.cpp
index 11e56c6d..42e6ac7f 100644
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -22,10 +22,7 @@
 #include "console.h"
 
 #include <time.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "gtkutil/accelerator.h"
diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 3c4f98fe..727ac358 100644
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -35,18 +35,7 @@
 
 #include <cstdlib>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include "stream/stringstream.h"
 #include "convert.h"
diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 83166da1..9708bd42 100644
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -33,22 +33,7 @@
 #include <map>
 #include <set>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 
diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 0303e55a..936dd520 100644
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -23,10 +23,7 @@
 
 #include "iselection.h"
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "string/string.h"
diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 54679a53..bb565b84 100644
--- a/radiant/feedback.cpp
+++ b/radiant/feedback.cpp
@@ -32,12 +32,7 @@
 #include "igl.h"
 #include "iselection.h"
 
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "map.h"
 #include "dialog.h"
diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index b19fc04f..12546173 100644
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -31,17 +31,7 @@
 
 #include "ishaders.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkarrow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/window.h"
 #include "stream/stringstream.h"
diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 7e4b67c1..6c95a5f5 100644
--- a/radiant/groupdialog.cpp
+++ b/radiant/groupdialog.cpp
@@ -32,10 +32,7 @@
 
 #include <vector>
 
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/widget.h"
 #include "gtkutil/accelerator.h"
@@ -46,7 +43,6 @@
 #include "commands.h"
 
 
-#include <gtk/gtkwidget.h>
 #include "gtkutil/window.h"
 
 class GroupDlg
diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 5c76cf61..a481ee11 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -45,22 +45,7 @@
 #include "iselection.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "os/path.h"
diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index e988544b..efa03ca7 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -34,8 +34,7 @@
 
 #include "gtkmisc.h"
 
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include "uilib/uilib.h"
 
 #include "math/vector.h"
diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index 3588c252..755c7330 100644
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -31,7 +31,7 @@
 #if !defined( INCLUDED_GTKMISC_H )
 #define INCLUDED_GTKMISC_H
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 inline void process_gui(){
diff --git a/radiant/main.cpp b/radiant/main.cpp
index d72aa6c8..1167cc76 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -70,7 +70,7 @@
 #include "iundo.h"
 
 #include "uilib/uilib.h"
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "cmdlib.h"
 #include "os/file.h"
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 7c1dea16..b75225eb 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -40,13 +40,7 @@
 #include <ctime>
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 
 #include "cmdlib.h"
diff --git a/radiant/map.cpp b/radiant/map.cpp
index 0dcf9791..1c228181 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -41,15 +41,8 @@ MapModules& ReferenceAPI_getMapModules();
 
 #include <set>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include "uilib/uilib.h"
 
 #include "scenelib.h"
@@ -2056,12 +2049,12 @@ void DoFind(){
 				GtkButton* button = create_dialog_button( "Find", G_CALLBACK( dialog_button_ok ), &dialog );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
 				widget_make_default( GTK_WIDGET( button ) );
-				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
+				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 			}
 			{
 				GtkButton* button = create_dialog_button( "Close", G_CALLBACK( dialog_button_cancel ), &dialog );
 				gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
+				gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
 			}
 		}
 	}
diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index a30de609..67690be1 100644
--- a/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include "os/file.h"
 #include "generic/callback.h"
diff --git a/radiant/multimon.cpp b/radiant/multimon.cpp
index 281a5bff..6fd41003 100644
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@ -44,7 +44,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/patchdialog.cpp b/radiant/patchdialog.cpp
index 2975e08b..bbe466c1 100644
--- a/radiant/patchdialog.cpp
+++ b/radiant/patchdialog.cpp
@@ -31,15 +31,7 @@
 
 #include "debugging/debugging.h"
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/idledraw.h"
 #include "gtkutil/entry.h"
diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index 91f0acf5..897cbd6d 100644
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -19,6 +19,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <gdk/gdkkeysyms.h>
 #include "patchmanip.h"
 
 #include "debugging/debugging.h"
@@ -723,13 +724,13 @@ void Patch_registerCommands(){
 	GlobalCommands_insert( "PatchCone", FreeCaller<Patch_Cone>() );
 	GlobalCommands_insert( "PatchSphere", FreeCaller<Patch_Sphere>() );
 	GlobalCommands_insert( "SimplePatchMesh", FreeCaller<Patch_Plane>(), Accelerator( 'P', (GdkModifierType)GDK_SHIFT_MASK ) );
-	GlobalCommands_insert( "PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>(), Accelerator( GDK_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+	GlobalCommands_insert( "PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 	GlobalCommands_insert( "PatchInsertAddColumn", FreeCaller<Patch_InsertAddColumn>() );
-	GlobalCommands_insert( "PatchInsertInsertRow", FreeCaller<Patch_InsertInsertRow>(), Accelerator( GDK_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
+	GlobalCommands_insert( "PatchInsertInsertRow", FreeCaller<Patch_InsertInsertRow>(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
 	GlobalCommands_insert( "PatchInsertAddRow", FreeCaller<Patch_InsertAddRow>() );
 	GlobalCommands_insert( "PatchDeleteFirstColumn", FreeCaller<Patch_DeleteFirstColumn>() );
-	GlobalCommands_insert( "PatchDeleteLastColumn", FreeCaller<Patch_DeleteLastColumn>(), Accelerator( GDK_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-	GlobalCommands_insert( "PatchDeleteFirstRow", FreeCaller<Patch_DeleteFirstRow>(), Accelerator( GDK_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
+	GlobalCommands_insert( "PatchDeleteLastColumn", FreeCaller<Patch_DeleteLastColumn>(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+	GlobalCommands_insert( "PatchDeleteFirstRow", FreeCaller<Patch_DeleteFirstRow>(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
 	GlobalCommands_insert( "PatchDeleteLastRow", FreeCaller<Patch_DeleteLastRow>() );
 	GlobalCommands_insert( "InvertCurve", FreeCaller<Patch_Invert>(), Accelerator( 'I', (GdkModifierType)GDK_CONTROL_MASK ) );
 	GlobalCommands_insert( "RedisperseRows", FreeCaller<Patch_RedisperseRows>(), Accelerator( 'E', (GdkModifierType)GDK_CONTROL_MASK ) );
@@ -837,12 +838,7 @@ void Patch_constructMenu( GtkMenu* menu ){
 }
 
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "gtkutil/dialog.h"
 #include "gtkutil/widget.h"
 
diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index 2f34e5e5..b79e81ca 100644
--- a/radiant/pluginmenu.cpp
+++ b/radiant/pluginmenu.cpp
@@ -23,8 +23,7 @@
 
 #include "stream/textstream.h"
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/pointer.h"
 #include "gtkutil/menu.h"
diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 9c762f46..17dd4ce7 100644
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -25,7 +25,7 @@
 #include "itoolbar.h"
 #include "modulesystem.h"
 
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 #include "stream/stringstream.h"
 #include "gtkutil/image.h"
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 86454c66..00723ab7 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -30,20 +30,7 @@
 
 #include "debugging/debugging.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 #include "math/vector.h"
diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index ee54ab8d..d97a65ef 100644
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -41,7 +41,7 @@
 
 #include <map>
 
-#include <gtk/gtktearoffmenuitem.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "stream/textfilestream.h"
diff --git a/radiant/select.cpp b/radiant/select.cpp
index fa04701e..0586d417 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -830,10 +830,7 @@ void Selection_destroy(){
 
 
 #include "gtkdlgs.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 
diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index dc59b332..245eb06d 100644
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -35,15 +35,8 @@
 #include "iundo.h"
 #include "iselection.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcheckbutton.h> //Shamus: For Textool
 
 #include "signal/isignal.h"
 #include "generic/object.h"
diff --git a/radiant/textureentry.h b/radiant/textureentry.h
index 3406d2a0..45151373 100644
--- a/radiant/textureentry.h
+++ b/radiant/textureentry.h
@@ -23,8 +23,7 @@
 #define INCLUDED_TEXTUREENTRY_H
 
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "gtkutil/idledraw.h"
 
 #include "generic/static.h"
diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 2b53597b..f9f2b870 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -41,11 +41,6 @@
 #include <vector>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
 #include <uilib/uilib.h>
 
 #include "signal/signal.h"
diff --git a/radiant/treemodel.cpp b/radiant/treemodel.cpp
index 7c6cae68..18cf5f83 100644
--- a/radiant/treemodel.cpp
+++ b/radiant/treemodel.cpp
@@ -24,9 +24,7 @@
 #include "debugging/debugging.h"
 
 #include <map>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
 
 #include "iscenegraph.h"
diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index 7ca79313..bd7e11ca 100644
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -36,7 +36,7 @@
 #include "watchbsp.h"
 
 #include <algorithm>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "cmdlib.h"
 #include "convert.h"
diff --git a/radiant/windowobservers.cpp b/radiant/windowobservers.cpp
index 24857c4d..d30d0e3c 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 fbe620c8..9785d9dc 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 <uilib/uilib.h>
 
 #include "math/vector.h"
diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index fafb1dad..a4e91441 100644
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -39,9 +39,9 @@
 #include "image.h"
 #include "gtkutil/messagebox.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include <uilib/uilib.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "generic/callback.h"
 #include "string/string.h"
@@ -2746,14 +2746,14 @@ void XYWindow_Construct(){
 	GlobalToggles_insert( "ToggleView", ToggleShown::ToggleCaller( g_xy_top_shown ), ToggleItem::AddCallbackCaller( g_xy_top_shown.m_item ), Accelerator( 'V', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 	GlobalToggles_insert( "ToggleSideView", ToggleShown::ToggleCaller( g_yz_side_shown ), ToggleItem::AddCallbackCaller( g_yz_side_shown.m_item ) );
 	GlobalToggles_insert( "ToggleFrontView", ToggleShown::ToggleCaller( g_xz_front_shown ), ToggleItem::AddCallbackCaller( g_xz_front_shown.m_item ) );
-	GlobalCommands_insert( "NextView", FreeCaller<XY_Next>(), Accelerator( GDK_Tab, (GdkModifierType)GDK_CONTROL_MASK ) );
-	GlobalCommands_insert( "ZoomIn", FreeCaller<XY_ZoomIn>(), Accelerator( GDK_Delete ) );
-	GlobalCommands_insert( "ZoomOut", FreeCaller<XY_ZoomOut>(), Accelerator( GDK_Insert ) );
-	GlobalCommands_insert( "ViewTop", FreeCaller<XY_Top>(), Accelerator( GDK_KP_Home ) );
-	GlobalCommands_insert( "ViewSide", FreeCaller<XY_Side>(), Accelerator( GDK_KP_Page_Down ) );
-	GlobalCommands_insert( "ViewFront", FreeCaller<XY_Front>(), Accelerator( GDK_KP_End ) );
+	GlobalCommands_insert( "NextView", FreeCaller<XY_Next>(), Accelerator( GDK_KEY_Tab, (GdkModifierType)GDK_CONTROL_MASK ) );
+	GlobalCommands_insert( "ZoomIn", FreeCaller<XY_ZoomIn>(), Accelerator( GDK_KEY_Delete ) );
+	GlobalCommands_insert( "ZoomOut", FreeCaller<XY_ZoomOut>(), Accelerator( GDK_KEY_Insert ) );
+	GlobalCommands_insert( "ViewTop", FreeCaller<XY_Top>(), Accelerator( GDK_KEY_KP_Home ) );
+	GlobalCommands_insert( "ViewSide", FreeCaller<XY_Side>(), Accelerator( GDK_KEY_KP_Page_Down ) );
+	GlobalCommands_insert( "ViewFront", FreeCaller<XY_Front>(), Accelerator( GDK_KEY_KP_End ) );
 	GlobalCommands_insert( "Zoom100", FreeCaller<XY_Zoom100>() );
-	GlobalCommands_insert( "CenterXYView", FreeCaller<XY_Focus>(), Accelerator( GDK_Tab, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+	GlobalCommands_insert( "CenterXYView", FreeCaller<XY_Focus>(), Accelerator( GDK_KEY_Tab, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
 	GlobalPreferenceSystem().registerPreference( "ClipCaulk", BoolImportStringCaller( g_clip_useCaulk ), BoolExportStringCaller( g_clip_useCaulk ) );
 
-- 
2.39.2