27 files changed, 178 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d1456419f..b9d0465fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d1456419f..b9d0465fb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Sat Nov 17 14:10:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gbsearcharray.h: Include gtypes.h not gobject/gtype.h
+
+	* glib/glib-object.h gobject/*.h: Prevent headers from
+	being included directly except when compiling GObject.
+
+	* gobject/gvaluecollector.h: Include glib-object.h so that
+	this file can be included directly, since we don't
+	include it _from_ glib-object.h.
+
+	* gobject/gtype.c: Remove struct _GValue hack since we 
+	now include glib/gvaluecollector.h which simply pulls in
+	glib-object.h.
+
 2001-11-15  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/giochannel.c: Documentation fixes.
diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
index 1682a7606..61b90b42b 100644
--- a/glib/gbsearcharray.h
+++ b/glib/gbsearcharray.h
@@ -21,7 +21,10 @@
 #ifndef __G_BSEARCH_ARRAY_H__
 #define __G_BSEARCH_ARRAY_H__
 
-#include        <gobject/gtype.h>
+#include        <glib/gtypes.h>
+#include        <glib/gutils.h>
+#include        <glib/gmem.h>
+#include        <glib/gmessages.h>
 
 G_BEGIN_DECLS
 
diff --git a/glib/glib-object.h b/glib/glib-object.h
index aefdd2f80..8687ef1f2 100644
--- a/glib/glib-object.h
+++ b/glib/glib-object.h
@@ -19,6 +19,8 @@
 #ifndef __GLIB_GOBJECT_H__
 #define __GLIB_GOBJECT_H__
 
+#define __GLIB_GOBJECT_H_INSIDE__
+
 /* topmost include file for GObject header files */
 #include	<gobject/gboxed.h>
 #include	<gobject/genums.h>
@@ -34,5 +36,6 @@
 #include	<gobject/gvaluearray.h>
 #include	<gobject/gvaluetypes.h>
 
+#undef __GLIB_GOBJECT_H_INSIDE__
 
 #endif /* __GLIB_GOBJECT_H__ */
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 63bdccbc5..5184fef52 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)/glib			\
 	-I$(top_builddir)			\
 	@GLIB_DEBUG_FLAGS@			\
+	-DGOBJECT_COMPILATION			\
 	-DG_DISABLE_CONST_RETURNS		\
 @STRIP_END@
 
diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index e29d95ac5..df92251c5 100644
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -19,6 +19,10 @@
 #ifndef __G_BOXED_H__
 #define __G_BOXED_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include        <gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index d188d0570..aa605404d 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -19,6 +19,9 @@
 #ifndef __G_CLOSURE_H__
 #define __G_CLOSURE_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include        <gobject/gtype.h>
 
diff --git a/gobject/genums.h b/gobject/genums.h
index 699d4bd5f..ea2c4be87 100644
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -19,6 +19,10 @@
 #ifndef __G_ENUMS_H__
 #define __G_ENUMS_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 5d3423228..cc5f3d7e7 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -19,6 +19,10 @@
 #ifndef __G_OBJECT_H__
 #define __G_OBJECT_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include        <gobject/gtype.h>
 #include        <gobject/gvalue.h>
 #include        <gobject/gparam.h>
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 6ed1c00c9..97ec62076 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -21,6 +21,9 @@
 #ifndef __G_PARAM_H__
 #define __G_PARAM_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gvalue.h>
 
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 98a15f678..075291ed4 100644
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -21,6 +21,9 @@
 #ifndef __G_PARAMSPECS_H__
 #define __G_PARAMSPECS_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include        <gobject/gvalue.h>
 #include        <gobject/genums.h>
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index a37d550ee..39cf580b7 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -19,6 +19,9 @@
 #ifndef __G_SIGNAL_H__
 #define __G_SIGNAL_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gclosure.h>
 #include	<gobject/gvalue.h>
diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index e12e15bfb..d017b72f9 100644
--- a/gobject/gsourceclosure.h
+++ b/gobject/gsourceclosure.h
@@ -19,6 +19,10 @@
 
 #ifndef __G_SOURCECLOSURE_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gclosure.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gtype.c b/gobject/gtype.c
index abe2e399b..427ff2f0b 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -137,10 +137,6 @@ static IFaceHolder*			type_iface_peek_holder_L	(TypeNode		*iface,
 
 
 /* --- structures --- */
-struct _GValue	/* kludge, keep in sync with gvalue.h */
-{
-  GType g_type;
-};
 struct _TypeNode
 {
   GTypePlugin *plugin;
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 0ae6475cb..aeb770d2f 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -19,6 +19,10 @@
 #ifndef __G_TYPE_H__
 #define __G_TYPE_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include        <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index b65badea7..4871f81b4 100644
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -20,6 +20,10 @@
 #ifndef __G_TYPE_MODULE_H__
 #define __G_TYPE_MODULE_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #include <gobject/gobject.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index df692589a..26f495219 100644
--- a/gobject/gtypeplugin.h
+++ b/gobject/gtypeplugin.h
@@ -19,6 +19,9 @@
 #ifndef __G_TYPE_PLUGIN_H__
 #define __G_TYPE_PLUGIN_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gtype.h>
 
diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index 4afb95cef..54310effe 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -21,6 +21,9 @@
 #ifndef __G_VALUE_H__
 #define __G_VALUE_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gtype.h>
 
diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index a24273175..456962e3a 100644
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -21,6 +21,9 @@
 #ifndef __G_VALUE_ARRAY_H__
 #define __G_VALUE_ARRAY_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gvalue.h>
 
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index 0f5e86524..e9379968a 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -21,6 +21,8 @@
 #ifndef __G_VALUE_COLLECTOR_H__
 #define __G_VALUE_COLLECTOR_H__
 
+#include <glib-object.h>
+
 G_BEGIN_DECLS
 
 /* we may want to add aggregate types here some day, if requested
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 06290075f..0423d5e05 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -21,6 +21,9 @@
 #ifndef __G_VALUETYPES_H__
 #define __G_VALUETYPES_H__
 
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
 
 #include	<gobject/gvalue.h>