Fixed compilation with DISABLE_SINGLE_INCLUDES

2011-09-26 00:41:51 -07:00 · 2011-09-26 00:41:51 -07:00 · a6381e5b8a
commit a6381e5b8a
parent 2bafb947c5
77 changed files with 84 additions and 102 deletions
--- a/m4/moo-flags.m4
+++ b/m4/moo-flags.m4
@ -75,6 +75,15 @@ AC_ARG_ENABLE(dev-mode,
 ])
 AM_CONDITIONAL(MOO_DEV_MODE, test x$MOO_DEV_MODE = "xyes")

+AC_ARG_ENABLE(strict-gtk,
+  AC_HELP_STRING([--enable-strict-gtk],[GTK_DISABLE_DEPRECATED, GTK_DISABLE_SINGLE_INCLUDES, etc.]),[
+    if test "x$enable_strict_gtk" = "xyes"; then
+      # MOO_CPPFLAGS="$MOO_CPPFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+      MOO_CPPFLAGS="$MOO_CPPFLAGS -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+      # MOO_CPPFLAGS="$MOO_CPPFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE"
+    fi
+])
+
 MOO_COMPILER

 _MOO_AC_CHECK_COMPILER_OPTIONS([dnl
--- a/moo/gtksourceview/gtksourcecontextengine.c
+++ b/moo/gtksourceview/gtksourcecontextengine.c
@ -25,7 +25,7 @@
 #include "gtksourcelanguage-private.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcestyle-private.h"
-#include <glib/gregex.h>
+#include <glib.h>
 #include <errno.h>
 #include <string.h>

--- a/moo/gtksourceview/gtksourceengine.h
+++ b/moo/gtksourceview/gtksourceengine.h
@ -22,7 +22,7 @@
 #ifndef __GTK_SOURCE_ENGINE_H__
 #define __GTK_SOURCE_ENGINE_H__

-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 #include <gtksourceview/gtksourcestylescheme.h>

 G_BEGIN_DECLS
--- a/moo/gtksourceview/gtksourceiter.h
+++ b/moo/gtksourceview/gtksourceiter.h
@ -22,7 +22,7 @@
 #ifndef __GTK_SOURCE_ITER_H__
 #define __GTK_SOURCE_ITER_H__

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

 G_BEGIN_DECLS

--- a/moo/gtksourceview/gtksourcelanguage-parser-2.c
+++ b/moo/gtksourceview/gtksourcelanguage-parser-2.c
@ -48,7 +48,7 @@
 #include "gtksourcelanguage.h"
 #include "gtksourcelanguage-private.h"
 #include "gtksourcecontextengine.h"
-#include <glib/gregex.h>
+#include <glib.h>

 #define PARSER_ERROR (parser_error_quark ())
 #define ATTR_NO_STYLE ""
--- a/moo/gtksourceview/gtksourcestyle-private.h
+++ b/moo/gtksourceview/gtksourcestyle-private.h
@ -22,7 +22,7 @@
 #define __GTK_SOURCE_STYLE_PRIVATE_H__

 #include "gtksourcestyle.h"
-#include <gtk/gtktexttag.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/gtksourceview/gtksourcestylescheme.h
+++ b/moo/gtksourceview/gtksourcestylescheme.h
@ -21,7 +21,7 @@
 #ifndef __GTK_SOURCE_STYLE_SCHEME_H__
 #define __GTK_SOURCE_STYLE_SCHEME_H__

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gtksourceview/gtksourcestyle.h>

 G_BEGIN_DECLS
--- a/moo/gtksourceview/gtktextregion.h
+++ b/moo/gtksourceview/gtktextregion.h
@ -24,7 +24,7 @@
 #ifndef __GTK_TEXT_REGION_H__
 #define __GTK_TEXT_REGION_H__

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

 G_BEGIN_DECLS

--- a/moo/mooapp/mooapp.c
+++ b/moo/mooapp/mooapp.c
@ -47,7 +47,7 @@
 #include "mooutils/moohelp.h"
 #include "mooutils/moocompat.h"
 #include "mooutils/mooutils-script.h"
-#include <glib/gmappedfile.h>
+#include <glib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
--- a/moo/mooapp/moohtml.c
+++ b/moo/mooapp/moohtml.c
@ -20,7 +20,7 @@
 #include "mooutils/moocompat.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>
 #include <errno.h>

--- a/moo/mooapp/moohtml.h
+++ b/moo/mooapp/moohtml.h
@ -16,7 +16,7 @@
 #ifndef MOO_HTML_H
 #define MOO_HTML_H

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

 G_BEGIN_DECLS

--- a/moo/mooapp/moolinklabel.h
+++ b/moo/mooapp/moolinklabel.h
@ -16,7 +16,7 @@
 #ifndef MOO_LINK_LABEL_H
 #define MOO_LINK_LABEL_H

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

 G_BEGIN_DECLS

--- a/moo/mooedit/mooeditaction-factory.h
+++ b/moo/mooedit/mooeditaction-factory.h
@ -18,7 +18,6 @@

 #include <mooutils/mooaction.h>
 #include <mooedit/mooedit.h>
-#include <gtk/gtkactiongroup.h>

 G_BEGIN_DECLS

--- a/moo/mooedit/mooeditaction.c
+++ b/moo/mooedit/mooeditaction.c
@ -23,7 +23,7 @@
 #include "mooedit/mooeditfiltersettings.h"
 #include "mooedit/mooedit-impl.h"
 #include "mooutils/mooutils.h"
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>


--- a/moo/mooedit/mooeditdialogs.c
+++ b/moo/mooedit/mooeditdialogs.c
@ -27,7 +27,7 @@
 #include "mooedit/mooeditsavemult-gxml.h"
 #include "mooedit/mootryencoding-gxml.h"
 #include <gtk/gtk.h>
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>


--- a/moo/mooedit/mooeditfiltersettings.c
+++ b/moo/mooedit/mooeditfiltersettings.c
@ -23,7 +23,7 @@
 #include "mooutils/mooprefs.h"
 #include "mooutils/mooutils-misc.h"
 #include "mooutils/mooutils-debug.h"
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>

 MOO_DEBUG_INIT(filters, FALSE)
--- a/moo/mooedit/mooeditor.c
+++ b/moo/mooedit/mooeditor.c
@ -43,7 +43,7 @@
 #include "mooutils/mooi18n.h"
 #include "mooutils/mooencodings.h"
 #include "mooutils/moolist.h"
-#include <glib/gbase64.h>
+#include <glib.h>
 #include <string.h>
 #include <stdlib.h>

--- a/moo/mooedit/moolinebuffer.h
+++ b/moo/mooedit/moolinebuffer.h
@ -20,7 +20,7 @@
 #ifndef MOO_LINE_BUFFER_H
 #define MOO_LINE_BUFFER_H

-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 #include "mooedit/mootextbtree.h"
 #include "mooedit/mootextbuffer.h"

--- a/moo/mooedit/moolinemark.h
+++ b/moo/mooedit/moolinemark.h
@ -16,7 +16,7 @@
 #ifndef MOO_LINE_MARK_H
 #define MOO_LINE_MARK_H

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

 G_BEGIN_DECLS

--- a/moo/mooedit/mootextbuffer.h
+++ b/moo/mooedit/mootextbuffer.h
@ -16,7 +16,7 @@
 #ifndef MOO_TEXT_BUFFER_H
 #define MOO_TEXT_BUFFER_H

-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 #include <mooedit/moolang.h>
 #include <mooedit/moolinemark.h>

--- a/moo/mooedit/mootextfind.h
+++ b/moo/mooedit/mootextfind.h
@ -16,11 +16,10 @@
 #ifndef MOO_TEXT_FIND_H
 #define MOO_TEXT_FIND_H

-#include <gtk/gtktextview.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <mooedit/mooedit-enums.h>
 #include <mooutils/moohistorylist.h>
-#include <glib/gregex.h>
+#include <glib.h>

 G_BEGIN_DECLS

--- a/moo/mooedit/mootextiter.h
+++ b/moo/mooedit/mootextiter.h
@ -16,7 +16,7 @@
 #ifndef MOO_TEXT_ITER_H
 #define MOO_TEXT_ITER_H

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

 G_BEGIN_DECLS

--- a/moo/mooedit/mootextsearch-private.h
+++ b/moo/mooedit/mootextsearch-private.h
@ -17,7 +17,7 @@
 #define MOO_TEXT_SEARCH_PRIVATE_H

 #include <mooedit/mootextsearch.h>
-#include <glib/gregex.h>
+#include <glib.h>

 G_BEGIN_DECLS

--- a/moo/mooedit/mootextsearch.c
+++ b/moo/mooedit/mootextsearch.c
@ -16,7 +16,7 @@
 #include "mooedit/mootextsearch-private.h"
 #include "gtksourceview/gtksourceview-api.h"
 #include "mooutils/mooutils-misc.h"
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>


--- a/moo/mooedit/mootextstylescheme.h
+++ b/moo/mooedit/mootextstylescheme.h
@ -16,8 +16,7 @@
 #ifndef MOO_TEXT_STYLE_SCHEME_H
 #define MOO_TEXT_STYLE_SCHEME_H

-#include <gtk/gtkwidget.h>
-#include <gtk/gtktexttag.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooedit/mootextview.c
+++ b/moo/mooedit/mootextview.c
@ -40,7 +40,7 @@
 #include "mooutils/mooutils-gobject.h"
 #include "mooedit/mooquicksearch-gxml.h"
 #include <gtk/gtk.h>
-#include <glib/gregex.h>
+#include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>

--- a/moo/mooedit/mootextview.h
+++ b/moo/mooedit/mootextview.h
@ -16,7 +16,7 @@
 #ifndef MOO_TEXT_VIEW_H
 #define MOO_TEXT_VIEW_H

-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 #include <mooedit/mooindenter.h>
 #include <mooedit/moolang.h>
 #include <mooedit/mootextsearch.h>
--- a/moo/moofileview/moobookmarkmgr.h
+++ b/moo/moofileview/moobookmarkmgr.h
@ -16,8 +16,7 @@
 #ifndef MOO_BOOKMARK_MGR_H
 #define MOO_BOOKMARK_MGR_H

-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <mooutils/moouixml.h>

 G_BEGIN_DECLS
--- a/moo/moofileview/moobookmarkview.h
+++ b/moo/moofileview/moobookmarkview.h
@ -21,7 +21,7 @@
 #define MOO_BOOKMARK_VIEW_H

 #include <moofileview/moobookmarkmgr.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/moofileview/moofile.c
+++ b/moo/moofileview/moofile.c
@ -44,9 +44,7 @@
 #if defined(HAVE_CARBON)
 #include <CoreServices/CoreServices.h>
 #endif
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>

 MOO_DEBUG_INIT(file, FALSE)

--- a/moo/moofileview/moofile.h
+++ b/moo/moofileview/moofile.h
@ -16,7 +16,7 @@
 #ifndef MOO_FILE_H
 #define MOO_FILE_H

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

 G_BEGIN_DECLS

--- a/moo/moofileview/moofilesystem.h
+++ b/moo/moofileview/moofilesystem.h
@ -28,7 +28,7 @@

 #include "moofileview/moofolder.h"
 #include <mooutils/moofilewatch.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>


 G_BEGIN_DECLS
--- a/moo/moofileview/moofileview-dialogs.h
+++ b/moo/moofileview/moofileview-dialogs.h
@ -21,7 +21,7 @@
 #define MOO_FILE_VIEW_DIALOGS_H

 #include "moofileview/moofile.h"
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/moofileview/moofileview-impl.h
+++ b/moo/moofileview/moofileview-impl.h
@ -14,8 +14,7 @@
 */

 #include <moofileview/moofileview.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>

 #ifndef MOO_FILE_VIEW_IMPL_H
 #define MOO_FILE_VIEW_IMPL_H
--- a/moo/moofileview/moofileview-private.h
+++ b/moo/moofileview/moofileview-private.h
@ -18,8 +18,7 @@
 #endif

 #include <moofileview/moofileview-impl.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>

 #ifndef MOO_FILE_VIEW_PRIVATE_H
 #define MOO_FILE_VIEW_PRIVATE_H
--- a/moo/moofileview/moofolder.c
+++ b/moo/moofileview/moofolder.c
@ -32,9 +32,7 @@
 #endif
 #include <errno.h>
 #include <time.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>

 #define NORMAL_PRIORITY         G_PRIORITY_DEFAULT_IDLE
 #define NORMAL_TIMEOUT          0.04
--- a/moo/moofileview/moofoldermodel.c
+++ b/moo/moofileview/moofoldermodel.c
@ -18,7 +18,7 @@
 #include "moofile-private.h"
 #include "moofolder-private.h"
 #include "moofoldermodel-private.h"
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>


 struct _MooFolderModelPrivate {
--- a/moo/moofileview/mooiconview.h
+++ b/moo/moofileview/mooiconview.h
@ -20,10 +20,7 @@
 #ifndef MOO_ICON_VIEW_H
 #define MOO_ICON_VIEW_H

-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/moofileview/mootreeview.h
+++ b/moo/moofileview/mootreeview.h
@ -20,7 +20,7 @@
 #ifndef MOO_TREE_VIEW_H
 #define MOO_TREE_VIEW_H

-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "moofileview/mooiconview.h"

 G_BEGIN_DECLS
--- a/moo/mooutils/mooaccelbutton.h
+++ b/moo/mooutils/mooaccelbutton.h
@ -16,7 +16,7 @@
 #ifndef MOO_ACCEL_BUTTON_H
 #define MOO_ACCEL_BUTTON_H

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


 G_BEGIN_DECLS
--- a/moo/mooutils/mooaction-private.h
+++ b/moo/mooutils/mooaction-private.h
@ -18,7 +18,7 @@

 #include <mooutils/mooaction.h>
 #include <mooutils/mooclosure.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/mooaction.h
+++ b/moo/mooutils/mooaction.h
@ -16,7 +16,7 @@
 #ifndef MOO_ACTION_H
 #define MOO_ACTION_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/mooactionbase-private.h
+++ b/moo/mooutils/mooactionbase-private.h
@ -17,7 +17,7 @@
 #define MOO_ACTION_BASE_PRIVATE_H

 #include <mooutils/mooactionbase.h>
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/mooactionbase.h
+++ b/moo/mooutils/mooactionbase.h
@ -16,7 +16,7 @@
 #ifndef MOO_ACTION_BASE_H
 #define MOO_ACTION_BASE_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/mooactioncollection.h
+++ b/moo/mooutils/mooactioncollection.h
@ -16,7 +16,7 @@
 #ifndef MOO_ACTION_COLLECTION_H
 #define MOO_ACTION_COLLECTION_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/mooactionfactory.h
+++ b/moo/mooutils/mooactionfactory.h
@ -16,7 +16,7 @@
 #ifndef MOO_ACTION_FACTORY_H
 #define MOO_ACTION_FACTORY_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moobigpaned.h
+++ b/moo/mooutils/moobigpaned.h
@ -16,7 +16,6 @@
 #ifndef MOO_BIG_PANED_H
 #define MOO_BIG_PANED_H

-#include <gtk/gtkframe.h>
 #include "moopaned.h"

 G_BEGIN_DECLS
--- a/moo/mooutils/moocombo.h
+++ b/moo/mooutils/moocombo.h
@ -16,8 +16,7 @@
 #ifndef MOO_COMBO_H
 #define MOO_COMBO_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moodialogs.h
+++ b/moo/mooutils/moodialogs.h
@ -16,7 +16,7 @@
 #ifndef MOOUTILS_DIALOGS_H
 #define MOOUTILS_DIALOGS_H

-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include "mooutils/moofiledialog.h"

 G_BEGIN_DECLS
--- a/moo/mooutils/mooentry.c
+++ b/moo/mooutils/mooentry.c
@ -24,10 +24,7 @@
 #include "mooutils/mooutils-gobject.h"
 #include "mooutils/mooeditops.h"
 #include "mooutils/mooi18n.h"
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>

--- a/moo/mooutils/mooentry.h
+++ b/moo/mooutils/mooentry.h
@ -16,7 +16,7 @@
 #ifndef MOO_ENTRY_H
 #define MOO_ENTRY_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moofiledialog.h
+++ b/moo/mooutils/moofiledialog.h
@ -16,7 +16,7 @@
 #ifndef MOO_FILE_DIALOG_H
 #define MOO_FILE_DIALOG_H

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <mooutils/mooutils-file.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/moofileicon.h
+++ b/moo/mooutils/moofileicon.h
@ -16,7 +16,7 @@
 #ifndef MOO_FILE_ICON_H
 #define MOO_FILE_ICON_H

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <mooutils/mooutils-file.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/moofilewriter.c
+++ b/moo/mooutils/moofilewriter.c
@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <glib/gstdio.h>
-#include <glib/gmappedfile.h>
+#include <glib.h>
 #include <gio/gio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
--- a/moo/mooutils/moofontsel.h
+++ b/moo/mooutils/moofontsel.h
@ -36,9 +36,7 @@
 #define MOO_FONTSEL_H


-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/mooglade.h
+++ b/moo/mooutils/mooglade.h
@ -16,7 +16,7 @@
 #ifndef MOO_GLADE_H
 #define MOO_GLADE_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moohelp.h
+++ b/moo/mooutils/moohelp.h
@ -16,7 +16,7 @@
 #ifndef MOO_HELP_H
 #define MOO_HELP_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moohistorylist.h
+++ b/moo/mooutils/moohistorylist.h
@ -16,7 +16,7 @@
 #ifndef MOO_HISTORY_LIST_H
 #define MOO_HISTORY_LIST_H

-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <mooutils/moomenumgr.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/mooi18n.h
+++ b/moo/mooutils/mooi18n.h
@ -17,7 +17,7 @@
 #define MOO_I18N_H

 #include <config.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>

 #ifdef ENABLE_NLS

--- a/moo/mooutils/moomenu.h
+++ b/moo/mooutils/moomenu.h
@ -16,7 +16,7 @@
 #ifndef MOO_MENU_H
 #define MOO_MENU_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moomenumgr.h
+++ b/moo/mooutils/moomenumgr.h
@ -16,7 +16,7 @@
 #ifndef MOO_MENU_MGR_H
 #define MOO_MENU_MGR_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moomenutoolbutton.h
+++ b/moo/mooutils/moomenutoolbutton.h
@ -16,7 +16,7 @@
 #ifndef MOO_MENU_TOOL_BUTTON_H
 #define MOO_MENU_TOOL_BUTTON_H

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


 G_BEGIN_DECLS
--- a/moo/mooutils/moonotebook.h
+++ b/moo/mooutils/moonotebook.h
@ -16,8 +16,7 @@
 #ifndef MOO_NOTEBOOK_H
 #define MOO_NOTEBOOK_H

-#include <gtk/gtkmenu.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/moopane.h
+++ b/moo/mooutils/moopane.h
@ -16,7 +16,7 @@
 #ifndef MOO_PANE_H
 #define MOO_PANE_H

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

 G_BEGIN_DECLS

--- a/moo/mooutils/moopaned.h
+++ b/moo/mooutils/moopaned.h
@ -17,7 +17,6 @@
 #define MOO_PANED_H

 #include "moopane.h"
-#include <gtk/gtkbin.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/mooprefs.c
+++ b/moo/mooutils/mooprefs.c
@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <gobject/gvaluecollector.h>
-#include <glib/gregex.h>
+#include <glib.h>

 #define MOO_PREFS_ELEMENT "moo-prefs"
 #define PROP_VERSION "version"
--- a/moo/mooutils/moostock.h
+++ b/moo/mooutils/moostock.h
@ -16,8 +16,7 @@
 #ifndef MOOUTILS_STOCK_H
 #define MOOUTILS_STOCK_H

-#include <gtk/gtkstock.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/mooutils-fs.c
+++ b/moo/mooutils/mooutils-fs.c
@ -31,8 +31,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <glib/gstdio.h>
-/* for glib-2.6 */
-#include <glib/gmappedfile.h>
+#include <glib.h>

 #ifdef __WIN32__
 #include <windows.h>
@ -1320,7 +1319,7 @@ _moo_rename (const char *old_name,
 */

 #define MOO_GLOB_REGEX
-#include <glib/gregex.h>
+#include <glib.h>

 typedef struct _MooGlob {
 #ifdef MOO_GLOB_REGEX
--- a/moo/mooutils/mooutils-fs.h
+++ b/moo/mooutils/mooutils-fs.h
@ -17,7 +17,7 @@
 #define MOO_UTILS_FS_H

 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>

 /* MSVC */
 #if defined(WIN32) && !defined(__GNUC__)
--- a/moo/mooutils/mooutils-gobject.h
+++ b/moo/mooutils/mooutils-gobject.h
@ -16,7 +16,7 @@
 #ifndef MOO_UTILS_GOBJECT_H
 #define MOO_UTILS_GOBJECT_H

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <mooutils/mooclosure.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/mooutils-misc.c
+++ b/moo/mooutils/mooutils-misc.c
@ -29,7 +29,7 @@
 #include "mooutils/mooarray.h"
 #include "mooutils/moologwindow-gxml.h"
 #include <gtk/gtk.h>
-#include <glib/gmappedfile.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
--- a/moo/plugins/ctags/ctags-view.h
+++ b/moo/plugins/ctags/ctags-view.h
@ -16,7 +16,7 @@
 #ifndef CTAGS_VIEW_H
 #define CTAGS_VIEW_H

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

 #define MOO_TYPE_CTAGS_VIEW              (_moo_ctags_view_get_type ())
 #define MOO_CTAGS_VIEW(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MOO_TYPE_CTAGS_VIEW, MooCtagsView))
--- a/moo/plugins/moofind.c
+++ b/moo/plugins/moofind.c
@ -33,9 +33,7 @@
 #include "plugins/moofind-gxml.h"
 #include "plugins/moogrep-gxml.h"
 #include "moo-help-sections.h"
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #ifndef __WIN32__
 #include <sys/wait.h>
--- a/moo/plugins/usertools/moocommand.h
+++ b/moo/plugins/usertools/moocommand.h
@ -16,7 +16,7 @@
 #ifndef MOO_COMMAND_H
 #define MOO_COMMAND_H

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "moooutputfilter.h"
 #include "moousertools-enums.h"

--- a/moo/plugins/usertools/moocommanddisplay.h
+++ b/moo/plugins/usertools/moocommanddisplay.h
@ -18,8 +18,7 @@

 #include <mooutils/mooutils-treeview.h>
 #include "moocommand.h"
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/moo/plugins/usertools/moooutputfilterregex.c
+++ b/moo/plugins/usertools/moooutputfilterregex.c
@ -23,7 +23,7 @@
 #include "mooutils/mooutils-misc.h"
 #include "mooutils/moomarkup.h"
 #include "mooutils/mooi18n.h"
-#include <glib/gregex.h>
+#include <glib.h>
 #include <string.h>

 #define FILTERS_VERSION     "1.0"
--- a/moo/plugins/usertools/moousertools-prefs.h
+++ b/moo/plugins/usertools/moousertools-prefs.h
@ -16,7 +16,7 @@
 #ifndef MOO_USER_TOOLS_PREFS_H
 #define MOO_USER_TOOLS_PREFS_H

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

 G_BEGIN_DECLS