diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a777c22c5e..734f9c7b36 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-02  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/Makefile.am (GTKDOC_CFLAGS, GTKDOC_LIBS): set these. 
+
+	* gdk/gdk.types: Add types derived from GObject, so that they get
+	an object hierarchy section.
+
 2002-05-01  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdk-sections.txt: Move GdkScreen struct to the GdkScreen section.
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index c4fe4db45a..d875c5a76b 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -126,8 +126,18 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS =
-GTKDOC_LIBS =
+GTKDOC_CFLAGS = @STRIP_BEGIN@ 				\
+	@CFLAGS@					\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_builddir)/gdk 				\
+	@GTK_DEBUG_FLAGS@				\
+	@GDK_DEP_CFLAGS@				\
+@STRIP_END@
+
+GTKDOC_LIBS = @STRIP_BEGIN@ 						\
+	$(top_builddir)/gdk/@gdktargetlib@        			\
+@STRIP_END@
 
 # Commands for compiling and linking 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
diff --git a/docs/reference/gdk/gdk.types b/docs/reference/gdk/gdk.types
index e69de29bb2..0b8638b535 100644
--- a/docs/reference/gdk/gdk.types
+++ b/docs/reference/gdk/gdk.types
@@ -0,0 +1,9 @@
+#include <gdk/gdk.h>
+
+gdk_display_get_type
+gdk_screen_get_type
+gdk_drawable_get_type
+gdk_window_object_get_type
+gdk_pixmap_get_type
+gdk_gc_get_type
+gdk_keymap_get_type