Merge pull request #496 from bviktor/toplevel-includes

Only include top level includes from GTK+, GLib and GDK-PixBuf Closes #486
2024-11-29 20:52:16 -05:00 · 2013-04-02 22:39:17 -07:00 · 2013-04-02 22:39:17 -07:00 · 8b72d53dcc
commit 8b72d53dcc
parent b5fef8d0e2 ef4aa16730
41 changed files with 14 additions and 348 deletions
--- a/configure.ac
+++ b/configure.ac
@ -191,7 +191,7 @@ if test "$glib" = no; then
 	AC_MSG_ERROR(Cannot find GLib!)
 fi

-COMMON_CFLAGS="$GLIB_CFLAGS"
+COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 COMMON_LIBS="$GLIB_LIBS"
 COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0"

@ -222,7 +222,7 @@ dnl ** GNOME ************************************************************
 dnl *********************************************************************

 GUI_LIBS="$GUI_LIBS $GTK_LIBS"
-GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
+GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"

 #if test "$gnome" = yes; then
 #	AC_PATH_PROG(pkgconfigpath, pkg-config)
--- a/src/common/modes.c
+++ b/src/common/modes.c
@ -19,8 +19,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <glib.h>
-#include <glib/gprintf.h>

 #include "hexchat.h"
 #include "hexchatc.h"
@ -34,6 +32,8 @@
 #include <strings.h>
 #endif

+#include <glib/gprintf.h>
+
 typedef struct
 {
 	server *serv;
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@ -27,8 +27,6 @@
 #endif

 #include "hexchat.h"
-#include <glib.h>
-
 #include "cfgfiles.h"
 #include "fe.h"
 #include "server.h"
--- a/src/common/text.c
+++ b/src/common/text.c
@ -33,7 +33,6 @@
 #endif

 #include "hexchat.h"
-#include <glib.h>
 #include "cfgfiles.h"
 #include "chanopt.h"
 #include "plugin.h"
--- a/src/common/util.c
+++ b/src/common/util.c
@ -48,7 +48,6 @@
 #include <errno.h>
 #include "hexchat.h"
 #include "hexchatc.h"
-#include <glib.h>
 #include <ctype.h>
 #include "util.h"

--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@ -2,7 +2,7 @@ localedir = $(datadir)/locale

 bin_PROGRAMS = hexchat

-AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"

 hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)

--- a/src/fe-gtk/about.c
+++ b/src/fe-gtk/about.c
@ -22,17 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkmain.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwindow.h>
-
 #ifdef USE_XLIB
 #include <gdk/gdkx.h>
 #endif
--- a/src/fe-gtk/ascii.c
+++ b/src/fe-gtk/ascii.c
@ -22,12 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkeditable.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "gtkutil.h"
--- a/src/fe-gtk/banlist.c
+++ b/src/fe-gtk/banlist.c
@ -28,19 +28,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtktable.h>
-#include <glib.h>
-
 #include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/modes.h"
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@ -30,21 +30,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvseparator.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
@ -58,10 +43,8 @@
 #include "maingui.h"
 #include "menu.h"

-
 #include "custom-list.h"

-
 enum
 {
 	COL_CHANNEL,
--- a/src/fe-gtk/chanview-tree.c
+++ b/src/fe-gtk/chanview-tree.c
@ -31,7 +31,6 @@ typedef struct
 #include "maingui.h"

 #include <gdk/gdk.h>
-#include <gtk/gtktreeview.h>

 static void 	/* row-activated, when a row is double clicked */
 cv_tree_activated_cb (GtkTreeView *view, GtkTreePath *path,
--- a/src/fe-gtk/chanview.c
+++ b/src/fe-gtk/chanview.c
@ -22,14 +22,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include <gtk/gtk.h>
-
-#include "chanview.h"
 #include "gtkutil.h"
-
+#include "chanview.h"

 /* treeStore columns */
-
 #define COL_NAME 0		/* (char *) */
 #define COL_CHAN 1		/* (chan *) */
 #define COL_ATTR 2		/* (PangoAttrList *) */
--- a/src/fe-gtk/dccgui.c
+++ b/src/fe-gtk/dccgui.c
@ -28,22 +28,6 @@
 #include "../common/inet.h"
 #include "fe-gtk.h"

-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkversion.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "../common/fe.h"
--- a/src/fe-gtk/editlist.c
+++ b/src/fe-gtk/editlist.c
@ -31,12 +31,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvseparator.h>
-
 #include "../common/hexchat.h"
 #include "../common/cfgfiles.h"
 #include "../common/hexchatc.h"
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@ -22,17 +22,9 @@

 #include "fe-gtk.h"

-#include <gtk/gtkmain.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkversion.h>
-
 #ifdef WIN32
 #include <gdk/gdkwin32.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
@ -62,15 +54,6 @@

 #ifdef USE_XLIB
 #include <gdk/gdkx.h>
-#include <gtk/gtkinvisible.h>
-#endif
-
-#ifdef USE_GTKSPELL
-#include <gtk/gtktextview.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
 #endif

 GdkPixmap *channelwin_pix;
--- a/src/fe-gtk/fe-gtk.h
+++ b/src/fe-gtk/fe-gtk.h
@ -48,9 +48,7 @@
 #  define _(x) (x)
 #endif

-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "banlist.h"

 #undef gtk_signal_connect
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@ -32,20 +32,6 @@

 #include "fe-gtk.h"

-#include <glib.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvscrollbar.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
@ -65,10 +51,6 @@
 #include "textgui.h"
 #include "fkeys.h"

-#ifdef USE_GTKSPELL
-#include <gtk/gtktextview.h>
-#endif
-
 static void replace_handle (GtkWidget * wid);
 void key_action_tab_clean (void);

--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@ -26,25 +26,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkbutton.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkfilechooserdialog.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
--- a/src/fe-gtk/gtkutil.h
+++ b/src/fe-gtk/gtkutil.h
@ -20,8 +20,7 @@
 #ifndef HEXCHAT_GTKUTIL_H
 #define HEXCHAT_GTKUTIL_H

-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>

 typedef void (*filereqcallback) (void *, char *file);

--- a/src/fe-gtk/ignoregui.c
+++ b/src/fe-gtk/ignoregui.c
@ -24,22 +24,6 @@
 #include <fcntl.h>
 #include "fe-gtk.h"

-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkversion.h>
-
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-
 #include "../common/hexchat.h"
 #include "../common/ignore.h"
 #include "../common/cfgfiles.h"
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@ -31,18 +31,6 @@
 #include <unistd.h>
 #endif

-#include <gtk/gtk.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "../common/server.h"
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@ -21,29 +21,6 @@
 #include <stdio.h>
 #include <ctype.h>

-#include <gtk/gtkarrow.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkvscrollbar.h>
-
 #include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/server.h"
@ -71,7 +48,6 @@
 #include "xtext.h"

 #ifdef USE_GTKSPELL
-#include <gtk/gtktextview.h>
 #include <gtkspell/gtkspell.h>
 #endif

--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@ -30,18 +30,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkversion.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
--- a/src/fe-gtk/notifygui.c
+++ b/src/fe-gtk/notifygui.c
@ -24,20 +24,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkscrolledwindow.h>
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-
 #include "../common/hexchat.h"
 #include "../common/notify.h"
 #include "../common/cfgfiles.h"
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@ -26,8 +26,6 @@
 #include "../common/fe.h"

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-#include <gtk/gtkstock.h>

 #include "../pixmaps/inline_pngs.h"

--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@ -29,7 +29,6 @@
 #include "pixmaps.h"
 #include "maingui.h"
 #include "menu.h"
-#include <gtk/gtk.h>

 #ifndef WIN32
 #include <unistd.h>
--- a/src/fe-gtk/plugingui.c
+++ b/src/fe-gtk/plugingui.c
@ -22,17 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkscrolledwindow.h>
-
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-
 #include "../common/hexchat.h"
 #define PLUGIN_C
 typedef struct session hexchat_context;
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@ -29,11 +29,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkstock.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
--- a/src/fe-gtk/search.c
+++ b/src/fe-gtk/search.c
@ -22,17 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktogglebutton.h>
-
 #include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@ -21,29 +21,6 @@
 #include <string.h>
 #include <ctype.h>

-#include <gtk/gtkversion.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktree.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@ -37,36 +37,10 @@
 #include "menu.h"
 #include "plugin-tray.h"

-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkhscale.h>
 #ifdef WIN32
 #include "../common/fe.h"
 #endif
 #ifdef USE_GTKSPELL
-#include <gtk/gtktextview.h>
 #include <gtkspell/gtkspell.h>
 #endif
 #ifdef USE_LIBSEXY
--- a/src/fe-gtk/sexy-marshal.c
+++ b/src/fe-gtk/sexy-marshal.c
@ -16,7 +16,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include	<glib-object.h>
+#include <glib-object.h>


 #ifdef G_ENABLE_DEBUG
--- a/src/fe-gtk/sexy-marshal.h
+++ b/src/fe-gtk/sexy-marshal.h
@ -19,7 +19,7 @@
 #ifndef __sexy_marshal_MARSHAL_H__
 #define __sexy_marshal_MARSHAL_H__

-#include	<glib-object.h>
+#include <glib-object.h>

 G_BEGIN_DECLS

--- a/src/fe-gtk/sexy-spell-entry.h
+++ b/src/fe-gtk/sexy-spell-entry.h
@ -22,7 +22,7 @@ typedef struct _SexySpellEntry      SexySpellEntry;
 typedef struct _SexySpellEntryClass SexySpellEntryClass;
 typedef struct _SexySpellEntryPriv  SexySpellEntryPriv;

-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>

 #define SEXY_TYPE_SPELL_ENTRY            (sexy_spell_entry_get_type())
 #define SEXY_SPELL_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_SPELL_ENTRY, SexySpellEntry))
--- a/src/fe-gtk/textgui.c
+++ b/src/fe-gtk/textgui.c
@ -26,16 +26,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkvscrollbar.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
--- a/src/fe-gtk/urlgrab.c
+++ b/src/fe-gtk/urlgrab.c
@ -22,16 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkscrolledwindow.h>
-
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@ -22,16 +22,6 @@

 #include "fe-gtk.h"

-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
 #include <gdk/gdkkeysyms.h>

 #include "../common/hexchat.h"
@ -50,11 +40,6 @@
 #include "userlistgui.h"
 #include "fkeys.h"

-#ifdef USE_GTKSPELL
-#include <gtk/gtktextview.h>
-#endif
-
-
 enum
 {
 	COL_PIX=0,		// GdkPixbuf *
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@ -42,12 +42,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkwindow.h>

 #ifdef HEXCHAT
 #ifdef WIN32
--- a/src/fe-gtk/xtext.h
+++ b/src/fe-gtk/xtext.h
@ -20,7 +20,7 @@
 #ifndef HEXCHAT_XTEXT_H
 #define HEXCHAT_XTEXT_H

-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 #ifdef USE_XFT
 #include <X11/Xft/Xft.h>
 #endif
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@ -32,7 +32,6 @@
 #endif
 #include <sys/types.h>
 #include <ctype.h>
-#include <glib.h>
 #include <glib-object.h>
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@ -15,7 +15,7 @@
 		<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->

 		<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->
-		<OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags>
+		<OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
 		<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>
 		<GendefPath>$(YourGendefPath)</GendefPath>
 		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>