diff --git a/contrib/brushexport/plugin.cpp b/contrib/brushexport/plugin.cpp
index b655bf18..48e57215 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/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index 330feb00..1c691672 100644
--- a/contrib/prtview/AboutDialog.cpp
+++ b/contrib/prtview/AboutDialog.cpp
@@ -19,7 +19,6 @@
 
 #include "AboutDialog.h"
 #include <gtk/gtk.h>
-#include <gtkutil/pointer.h>
 #include "version.h"
 #include "gtkutil/pointer.h"
 
diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index 943a737b..19d2c9ee 100644
--- a/contrib/prtview/LoadPortalFileDialog.cpp
+++ b/contrib/prtview/LoadPortalFileDialog.cpp
@@ -23,7 +23,6 @@
 #include "LoadPortalFileDialog.h"
 
 #include <gtk/gtk.h>
-#include <gtkutil/pointer.h>
 #include "stream/stringstream.h"
 #include "convert.h"
 #include "gtkutil/pointer.h"
diff --git a/libs/gtkutil/accelerator.cpp b/libs/gtkutil/accelerator.cpp
index 9bf0c1cd..f88da9e6 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/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 d496c9cc..7810fa23 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.h b/libs/gtkutil/cursor.h
index 5ba9d994..19fc1887 100644
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -24,16 +24,10 @@
 
 #include <glib.h>
 #include <gdk/gdkevents.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "debugging/debugging.h"
 
-typedef struct _GdkCursor GdkCursor;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
-
 #if 0
 GdkCursor* create_blank_cursor();
 void blank_cursor( GtkWidget* widget );
diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 1ec56c9f..a9420452 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..59e6eb84 100644
--- a/libs/gtkutil/dialog.h
+++ b/libs/gtkutil/dialog.h
@@ -25,20 +25,7 @@
 #include "generic/callback.h"
 #include "generic/arrayrange.h"
 #include "qerplugin.h"
-#include <gtk/gtkenums.h>
-
-typedef int gint;
-typedef gint gboolean;
-typedef struct _GdkEventAny GdkEventAny;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkHBox GtkHBox;
-typedef struct _GtkVBox GtkVBox;
-typedef struct _GtkRadioButton GtkRadioButton;
-typedef struct _GtkFrame GtkFrame;
-typedef struct _GtkEntry GtkEntry;
-typedef struct _GtkButton GtkButton;
-typedef struct _GtkLabel GtkLabel;
-typedef struct _GtkTable GtkTable;
+#include <gtk/gtk.h>
 
 
 struct ModalDialog
@@ -59,15 +46,6 @@ struct ModalDialogButton
 	EMessageBoxReturn m_value;
 };
 
-typedef void ( *GCallback )( void );
-typedef void* gpointer;
-typedef struct _GtkWindow GtkWindow;
-typedef struct _GtkTable GtkTable;
-typedef struct _GtkButton GtkButton;
-typedef struct _GtkVBox GtkVBox;
-typedef struct _GtkHBox GtkHBox;
-typedef struct _GtkFrame GtkFrame;
-
 GtkWindow* create_fixedsize_modal_window( GtkWindow* parent, const char* title, int width, int height );
 
 GtkWindow* create_dialog_window( GtkWindow* parent, const char* title, GCallback func, gpointer data, int default_w = -1, int default_h = -1 );
@@ -134,7 +112,6 @@ BrowsedPathEntry( const BrowseCallback& browse );
 
 GtkLabel* DialogLabel_new( const char* name );
 GtkTable* DialogRow_new( const char* name, GtkWidget* widget );
-typedef struct _GtkVBox GtkVBox;
 void DialogVBox_packRow( GtkVBox* vbox, GtkWidget* row );
 
 
diff --git a/libs/gtkutil/entry.h b/libs/gtkutil/entry.h
index 814be152..66beace1 100644
--- a/libs/gtkutil/entry.h
+++ b/libs/gtkutil/entry.h
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#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 5b29cb00..35229eec 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 "string/string.h"
 #include "stream/stringstream.h"
diff --git a/libs/gtkutil/frame.cpp b/libs/gtkutil/frame.cpp
index 8914fb70..57d9cd21 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>
 
 GtkFrame* create_framed_widget( GtkWidget* widget ){
 	GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp
index c21358c1..85f54017 100644
--- a/libs/gtkutil/glfont.cpp
+++ b/libs/gtkutil/glfont.cpp
@@ -706,7 +706,7 @@ GLFont *glfont_create( const char* font_string ){
 
 #include <pango/pangoft2.h>
 #include <pango/pango-utils.h>
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 PangoFont* tryFont( const char* font_string, PangoFontMap *fontmap, PangoContext *context, PangoFontDescription*& font_desc ){
 	pango_font_description_free( font_desc );
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 968797d7..97bd0bff 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 805ea04a..11cb075e 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 "generic/callback.h"
 
diff --git a/libs/gtkutil/messagebox.cpp b/libs/gtkutil/messagebox.cpp
index 986dceba..350e1dd4 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 1dc675f5..72f56bee 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"
@@ -32,8 +30,6 @@
 #include "pointer.h"
 #include "button.h"
 
-typedef struct _GtkEntry GtkEntry;
-
 
 inline gboolean escape_clear_focus_widget( GtkWidget* widget, GdkEventKey* event, gpointer data ){
 	if ( event->keyval == GDK_KEY_Escape ) {
diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index 458f7597..8a922101 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 "frame.h"
 
diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index ea045b2d..9f1e81cb 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 "generic/callback.h"
 
diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h
index 4e715b1f..826858ae 100644
--- a/libs/gtkutil/widget.h
+++ b/libs/gtkutil/widget.h
@@ -23,13 +23,11 @@
 #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"
 
-#include <gtk/gtkmain.h>
-
 inline bool widget_is_visible( GtkWidget* widget ){
 	//return GTK_WIDGET_VISIBLE( widget ) != FALSE;
 	return gtk_widget_get_visible( widget ) != FALSE;
diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index cf491b29..6f68a162 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 "pointer.h"
 #include "accelerator.h"
diff --git a/libs/gtkutil/window.h b/libs/gtkutil/window.h
index cd597c86..ed6c5822 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"
@@ -47,7 +47,6 @@ gboolean persistent_floating_window_delete( GtkWindow* floating, GdkEvent *event
 
 void window_remove_minmax( GtkWindow* window );
 
-typedef struct _GtkScrolledWindow GtkScrolledWindow;
 GtkScrolledWindow* create_scrolled_window( GtkPolicyType hscrollbar_policy, GtkPolicyType vscrollbar_policy, int border = 0 );
 
 
diff --git a/radiant/build.cpp b/radiant/build.cpp
index b3d79b7d..50ba3f38 100644
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -635,16 +635,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/gtkexpander.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include "gtkutil/dialog.h"
 #include "gtkutil/closure.h"
diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index 343738e1..f7b12ba4 100644
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -27,10 +27,9 @@
 #include <map>
 #include "string/string.h"
 #include "versionlib.h"
+#include <gtk/gtk.h>
 #include "gtkutil/accelerator.h"
 #include "gtkutil/messagebox.h"
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkbutton.h>
 #include "gtkmisc.h"
 
 struct ShortcutValue{
@@ -150,12 +149,6 @@ void connect_accelerator( const char *name ){
 
 #include <cctype>
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-
 #include "gtkutil/dialog.h"
 #include "mainframe.h"
 
diff --git a/radiant/console.cpp b/radiant/console.cpp
index 7e70895f..1d98b23b 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 "gtkutil/accelerator.h"
 #include "gtkutil/messagebox.h"
@@ -106,7 +103,6 @@ gboolean destroy_set_null( GtkWindow* widget, GtkWidget** p ){
 
 WidgetFocusPrinter g_consoleWidgetFocusPrinter( "console" );
 
-#include <gtk/gtkvbox.h>
 
 GtkWidget* Console_constructWindow( GtkWindow* toplevel ){
 	GtkWidget* scr = gtk_scrolled_window_new( 0, 0 );
diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 8c0549d1..7a1b9c38 100644
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -35,18 +35,7 @@
 
 #include <stdlib.h>
 
-#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 ea66c9b2..3d596355 100644
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -33,24 +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/gtkstock.h>
-
+#include <gtk/gtk.h>
 
 #include "os/path.h"
 #include "eclasslib.h"
diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 864d8e21..19b9bf1c 100644
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -23,13 +23,7 @@
 
 #include "iselection.h"
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #include "string/string.h"
 #include "scenelib.h"
@@ -295,7 +289,6 @@ gint graph_tree_model_compare_name( GtkTreeModel *model, GtkTreeIter *a, GtkTree
 }
 
 /* search */
-#include <gtk/gtkstock.h>
 static gboolean tree_view_search_equal_func( GtkTreeModel* model, gint column, const gchar* key, GtkTreeIter* iter, gpointer search_from_start ) {
 	scene::Node* node;
 	gtk_tree_model_get( model, iter, column, (gpointer*)&node, -1 );
diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp
index 11292173..f9a02225 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/filterbar.cpp b/radiant/filterbar.cpp
index 71e4e4f5..e5e71b97 100644
--- a/radiant/filterbar.cpp
+++ b/radiant/filterbar.cpp
@@ -1,5 +1,5 @@
 #include "filterbar.h"
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 #include "gtkmisc.h"
 #include "gtkutil/widget.h"
 #include "stream/stringstream.h"
diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index c332eb36..2e9f60d0 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 10147c05..df6e0d01 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 65908df6..5282fbc2 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -45,23 +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/gtkspinbutton.h>
+#include <gtk/gtk.h>
 
 #include "os/path.h"
 #include "math/aabb.h"
@@ -869,7 +853,6 @@ static TextEditor g_textEditor;
 
 // =============================================================================
 // Light Intensity dialog
-#include <gtk/gtkcheckbutton.h>
 
 bool g_dontDoLightIntensityDlg = false;
 
diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index e20b4d75..6787df34 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -34,9 +34,7 @@
 
 #include "gtkmisc.h"
 
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfontsel.h>
+#include <gtk/gtk.h>
 
 #include "math/vector.h"
 #include "os/path.h"
@@ -48,6 +46,13 @@
 #include "commands.h"
 
 
+void process_gui(){
+	while ( gtk_events_pending() )
+	{
+		gtk_main_iteration();
+	}
+}
+
 // =============================================================================
 // Misc stuff
 
diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h
index 3ea7363e..986b5f50 100644
--- a/radiant/gtkmisc.h
+++ b/radiant/gtkmisc.h
@@ -31,14 +31,7 @@
 #if !defined( INCLUDED_GTKMISC_H )
 #define INCLUDED_GTKMISC_H
 
-#include <gtk/gtkmain.h>
-
-inline void process_gui(){
-	while ( gtk_events_pending() )
-	{
-		gtk_main_iteration();
-	}
-}
+void process_gui();
 
 void command_connect_accelerator( const char* commandName );
 void command_disconnect_accelerator( const char* commandName );
@@ -63,7 +56,7 @@ GtkButton* toolbar_append_button( GtkToolbar* toolbar, const char* description,
 // this DOES NOT set up the shortcut using command_connect_accelerator
 GtkToggleButton* toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const char* commandName );
 
-
+typedef struct _GtkWidget GtkWidget;
 template<typename Element> class BasicVector3;
 typedef BasicVector3<float> Vector3;
 bool color_dialog( GtkWidget *parent, Vector3& color, const char* title = "Choose Color" );
diff --git a/radiant/main.cpp b/radiant/main.cpp
index 2e67f1b3..53ffdbd4 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -69,7 +69,7 @@
 
 #include "iundo.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 d394e378..5ced78db 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -43,17 +43,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/gtkmenubar.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktable.h>
-
+#include <gtk/gtk.h>
 
 #include "cmdlib.h"
 #include "scenelib.h"
diff --git a/radiant/map.cpp b/radiant/map.cpp
index 83e2a695..2b315f8c 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -40,15 +40,7 @@
 
 #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 "scenelib.h"
 #include "transformlib.h"
diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index 15413815..f0b28130 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/patchdialog.cpp b/radiant/patchdialog.cpp
index 963e3def..09910794 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 bc2e7801..13b34483 100644
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -972,13 +972,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/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "gtkutil/dialog.h"
 #include "gtkutil/widget.h"
 
diff --git a/radiant/pluginapi.cpp b/radiant/pluginapi.cpp
index fff61864..c44ab4e6 100644
--- a/radiant/pluginapi.cpp
+++ b/radiant/pluginapi.cpp
@@ -27,8 +27,6 @@
 #include "generic/callback.h"
 #include "math/vector.h"
 
-#include "gtkmisc.h"
-
 #include "camwindow.h"
 
 #include "mainframe.h"
diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp
index eda7f9a3..517a624b 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 f06c63c6..ba8643c2 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 e912b76a..1eaae36d 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 71c18ecc..6fd7d38e 100644
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -41,7 +41,7 @@
 
 #include <map>
 
-#include <gtk/gtktearoffmenuitem.h>
+#include <gtk/gtk.h>
 
 #include "stream/textfilestream.h"
 #include "cmdlib.h"
diff --git a/radiant/select.cpp b/radiant/select.cpp
index f6f64a88..ccf25cd8 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -43,7 +43,6 @@
 #include "patchmanip.h"
 #include "patchdialog.h"
 #include "texwindow.h"
-#include "gtkmisc.h"
 #include "mainframe.h"
 #include "grid.h"
 #include "map.h"
@@ -1135,10 +1134,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 3de6128f..87e2dd96 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 780a630d..c28fe8ae 100644
--- a/radiant/textureentry.h
+++ b/radiant/textureentry.h
@@ -23,8 +23,8 @@
 #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 033bed77..a34b010b 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 "signal/signal.h"
 #include "math/vector.h"
diff --git a/radiant/treemodel.cpp b/radiant/treemodel.cpp
index 4f116964..2194d89b 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 "iscenegraph.h"
 #include "nameable.h"
diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index f9cd833f..4ba76fa6 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/xywindow.cpp b/radiant/xywindow.cpp
index f6e1f06f..3c737618 100644
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -39,8 +39,7 @@
 #include "image.h"
 #include "gtkutil/messagebox.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include "generic/callback.h"
 #include "string/string.h"