[glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo

14 files changed, 16 insertions, 14 deletions

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 299ff007..187caed3 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -20,7 +20,8 @@ INCLUDES =					\
 	$(FREETYPE_CFLAGS)			\
 	$(FONTCONFIG_CFLAGS)                    \
 	$(cairo_includes)			\
-	$(POPPLER_GLIB_DISABLE_DEPRECATED)
+	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
+	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
 stamp_files = stamp-poppler-enums.h
 
diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
index 41e071d2..a79dbec3 100644
--- a/glib/demo/Makefile.am
+++ b/glib/demo/Makefile.am
@@ -3,7 +3,8 @@ INCLUDES = 					\
 	-I$(top_builddir)/glib			\
 	$(GTK_TEST_CFLAGS)			\
 	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
-	-DGTK_DISABLE_DEPRECATED
+	-DGTK_DISABLE_DEPRECATED		\
+	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
 if BUILD_GTK_TEST
 noinst_PROGRAMS = poppler-glib-demo
diff --git a/glib/demo/annots.h b/glib/demo/annots.h
index 01a1fb81..844e4f52 100644
--- a/glib/demo/annots.h
+++ b/glib/demo/annots.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _ANNOTS_H_
diff --git a/glib/demo/attachments.h b/glib/demo/attachments.h
index 330b3c17..36dab828 100644
--- a/glib/demo/attachments.h
+++ b/glib/demo/attachments.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _ATTACHMENTS_H_
diff --git a/glib/demo/fonts.h b/glib/demo/fonts.h
index 42ccc2e4..b13447c3 100644
--- a/glib/demo/fonts.h
+++ b/glib/demo/fonts.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _FONTS_H_
diff --git a/glib/demo/forms.h b/glib/demo/forms.h
index 4e0c9c04..5b793bd1 100644
--- a/glib/demo/forms.h
+++ b/glib/demo/forms.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _FORMS_H_
diff --git a/glib/demo/images.h b/glib/demo/images.h
index 60a79dbc..6180c3b2 100644
--- a/glib/demo/images.h
+++ b/glib/demo/images.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _IMAGES_H_
diff --git a/glib/demo/info.h b/glib/demo/info.h
index e96ee00f..a8b34d49 100644
--- a/glib/demo/info.h
+++ b/glib/demo/info.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _INFO_H_
diff --git a/glib/demo/links.h b/glib/demo/links.h
index 4e1ec2aa..b7dbaeb4 100644
--- a/glib/demo/links.h
+++ b/glib/demo/links.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _LINKS_H_
diff --git a/glib/demo/outline.h b/glib/demo/outline.h
index a96f0c9c..61b8238b 100644
--- a/glib/demo/outline.h
+++ b/glib/demo/outline.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _OUTLINE_H_
diff --git a/glib/demo/page.h b/glib/demo/page.h
index 7968e44a..5b86a81d 100644
--- a/glib/demo/page.h
+++ b/glib/demo/page.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _PAGE_H_
diff --git a/glib/demo/render.h b/glib/demo/render.h
index 5e76a3e6..46f70396 100644
--- a/glib/demo/render.h
+++ b/glib/demo/render.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _RENDER_H_
diff --git a/glib/demo/transitions.h b/glib/demo/transitions.h
index 31d36777..11d8bd47 100644
--- a/glib/demo/transitions.h
+++ b/glib/demo/transitions.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _TRANSITIONS_H_
diff --git a/glib/demo/utils.h b/glib/demo/utils.h
index d2d46d9e..a757482a 100644
--- a/glib/demo/utils.h
+++ b/glib/demo/utils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <poppler.h>
 
 #ifndef _UTILS_H_