libgimp*: add guards that #error out if individual files are included

This only helps to maintain proper includes in app/ and shouldn't
affect plug-ins at all, because these are supposed to only include the
main headers from libgimp/ since the beginning of time.

The gimpfootypes.h files do not have these guards, so we can continue
to maintain app/'s include policy that is very likely to error out if
wrong things are included.

configure.ac

@@ -2005,6 +2005,10 @@ AC_CONFIG_COMMANDS([libgimpbase/gimpversion.h], [
  * This is a generated file.  Please modify 'configure.ac'
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_VERSION_H__
 #define __GIMP_VERSION_H__
 

libgimpbase/Makefile.am

@@ -51,7 +51,8 @@ AM_CPPFLAGS = \
 	-DGIMP_DATA_VERSION=\"$(GIMP_DATA_VERSION)\"		\
 	-DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\"	\
 	-DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\"	\
-	-DG_LOG_DOMAIN=\"LibGimpBase\"
+	-DG_LOG_DOMAIN=\"LibGimpBase\"				\
+	-DGIMP_BASE_COMPILATION
 
 AM_CCASFLAGS = \
 	-I$(top_builddir)	\

libgimpbase/gimpbase.h

@@ -19,6 +19,7 @@
 #ifndef __GIMP_BASE_H__
 #define __GIMP_BASE_H__
 
+#define __GIMP_BASE_H_INSIDE__
 
 #include <libgimpbase/gimpbasetypes.h>
 
@@ -38,5 +39,6 @@
 #include <libgimpbase/gimpsignal.h>
 #endif
 
+#undef __GIMP_BASE_H_INSIDE__
 
 #endif  /* __GIMP_BASE_H__ */

libgimpbase/gimpchecks.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CHECKS_H__
 #define __GIMP_CHECKS_H__
 

libgimpbase/gimpcpuaccel.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CPU_ACCEL_H__
 #define __GIMP_CPU_ACCEL_H__
 

libgimpbase/gimpdatafiles.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_DATAFILES_H__
 #define __GIMP_DATAFILES_H__
 

libgimpbase/gimpenv.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMPENV_H__
 #define __GIMPENV_H__
 

libgimpbase/gimplimits.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_LIMITS_H__
 #define __GIMP_LIMITS_H__
 

libgimpbase/gimpmemsize.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_MEMSIZE_H__
 #define __GIMP_MEMSIZE_H__
 

libgimpbase/gimpparasite.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PARASITE_H__
 #define __GIMP_PARASITE_H__
 

libgimpbase/gimprectangle.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_RECTANGLE_H__
 #define __GIMP_RECTANGLE_H__
 

libgimpbase/gimpunit.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_UNIT_H__
 #define __GIMP_UNIT_H__
 

libgimpbase/gimputils.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_BASE_H_INSIDE__) && !defined (GIMP_BASE_COMPILATION)
+#error "Only <libgimpbase/gimpbase.h> can be included directly."
+#endif
+
 #ifndef __GIMP_UTILS_H__
 #define __GIMP_UTILS_H__
 

libgimpcolor/Makefile.am

@@ -47,7 +47,8 @@ endif
 libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpColor\"
+	-DG_LOG_DOMAIN=\"LibGimpColor\"	\
+	-DGIMP_COLOR_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)	\

libgimpcolor/gimpadaptivesupersample.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_ADAPTIVE_SUPERSAMPLE_H__
 #define __GIMP_ADAPTIVE_SUPERSAMPLE_H__
 

libgimpcolor/gimpbilinear.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_BILINEAR_H__
 #define __GIMP_BILINEAR_H__
 

libgimpcolor/gimpcmyk.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CMYK_H__
 #define __GIMP_CMYK_H__
 

libgimpcolor/gimpcolor.h

@@ -19,6 +19,7 @@
 #ifndef __GIMP_COLOR_H__
 #define __GIMP_COLOR_H__
 
+#define __GIMP_COLOR_H_INSIDE__
 
 #include <libgimpcolor/gimpcolortypes.h>
 
@@ -31,5 +32,6 @@
 #include <libgimpcolor/gimphsv.h>
 #include <libgimpcolor/gimprgb.h>
 
+#undef __GIMP_COLOR_H_INSIDE__
 
 #endif  /* __GIMP_COLOR_H__ */

libgimpcolor/gimpcolormanaged.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_MANAGED_H__
 #define __GIMP_COLOR_MANAGED_H__
 

libgimpcolor/gimpcolorspace.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_SPACE_H__
 #define __GIMP_COLOR_SPACE_H__
 

libgimpcolor/gimphsl.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_HSL_H__
 #define __GIMP_HSL_H__
 

libgimpcolor/gimphsv.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_HSV_H__
 #define __GIMP_HSV_H__
 

libgimpcolor/gimprgb.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
 #ifndef __GIMP_RGB_H__
 #define __GIMP_RGB_H__
 

libgimpconfig/Makefile.am

@@ -44,7 +44,8 @@ endif
 libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpConfig\"
+	-DG_LOG_DOMAIN=\"LibGimpConfig\"	\
+	-DGIMP_CONFIG_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)	\
@@ -132,7 +133,7 @@ CLEANFILES = $(gen_sources)
 
 $(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKENUMS)
 	$(GIMP_MKENUMS) \
-		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"libgimpbase/gimpbasetypes.h\"\n#include \"gimpcolorconfig-enums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
+		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpcolorconfig-enums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
 		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

libgimpconfig/gimpcolorconfig-enums.c

@@ -3,7 +3,7 @@
 
 #include "config.h"
 #include <glib-object.h>
-#include "libgimpbase/gimpbasetypes.h"
+#include "libgimpbase/gimpbase.h"
 #include "gimpcolorconfig-enums.h"
 #include "libgimp/libgimp-intl.h"
 

libgimpconfig/gimpcolorconfig.c

@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
 #include "gimpconfigtypes.h"

libgimpconfig/gimpcolorconfig.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_CONFIG_H__
 #define __GIMP_COLOR_CONFIG_H__
 

libgimpconfig/gimpconfig-deserialize.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_DESERIALIZE_H__
 #define __GIMP_CONFIG_DESERIALIZE_H__
 

libgimpconfig/gimpconfig-error.h

@@ -18,6 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_ERROR_H__
 #define __GIMP_CONFIG_ERROR_H__
 

libgimpconfig/gimpconfig-iface.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_IFACE_H__
 #define __GIMP_CONFIG_IFACE_H__
 

libgimpconfig/gimpconfig-params.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_PARAMS_H__
 #define __GIMP_CONFIG_PARAMS_H__
 

libgimpconfig/gimpconfig-path.h

@@ -19,10 +19,13 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_PATH_H__
 #define __GIMP_CONFIG_PATH_H__
 
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */

libgimpconfig/gimpconfig-serialize.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_SERIALIZE_H__
 #define __GIMP_CONFIG_SERIALIZE_H__
 

libgimpconfig/gimpconfig-utils.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_UTILS_H__
 #define __GIMP_CONFIG_UTILS_H__
 

libgimpconfig/gimpconfig.h

@@ -19,6 +19,7 @@
 #ifndef __GIMP_CONFIG_H__
 #define __GIMP_CONFIG_H__
 
+#define __GIMP_CONFIG_H_INSIDE__
 
 #include <libgimpconfig/gimpconfigtypes.h>
 
@@ -34,5 +35,6 @@
 
 #include <libgimpconfig/gimpcolorconfig.h>
 
+#undef __GIMP_CONFIG_H_INSIDE__
 
 #endif  /* __GIMP_CONFIG_H__ */

libgimpconfig/gimpconfigwriter.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CONFIG_WRITER_H__
 #define __GIMP_CONFIG_WRITER_H__
 

libgimpconfig/gimpscanner.h

@@ -20,6 +20,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_CONFIG_H_INSIDE__) && !defined (GIMP_CONFIG_COMPILATION)
+#error "Only <libgimpconfig/gimpconfig.h> can be included directly."
+#endif
+
 #ifndef __GIMP_SCANNER_H__
 #define __GIMP_SCANNER_H__
 

libgimpmath/Makefile.am

@@ -47,7 +47,8 @@ endif
 libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpMath\"
+	-DG_LOG_DOMAIN=\"LibGimpMath\"	\
+	-DGIMP_MATH_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)	\

libgimpmath/gimpmath.h

@@ -21,6 +21,7 @@
 #ifndef __GIMP_MATH_H__
 #define __GIMP_MATH_H__
 
+
 #include <math.h>
 
 #ifdef HAVE_IEEEFP_H
@@ -31,12 +32,17 @@
 #include <float.h>
 #endif
 
+#define __GIMP_MATH_H_INSIDE__
+
 #include <libgimpmath/gimpmathtypes.h>
 
 #include <libgimpmath/gimpmatrix.h>
 #include <libgimpmath/gimpmd5.h>
 #include <libgimpmath/gimpvector.h>
 
+#undef __GIMP_MATH_H_INSIDE__
+
+
 G_BEGIN_DECLS
 
 

libgimpmath/gimpmatrix.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_MATH_H_INSIDE__) && !defined (GIMP_MATH_COMPILATION)
+#error "Only <libgimpmath/gimpmath.h> can be included directly."
+#endif
+
 #ifndef __GIMP_MATRIX_H__
 #define __GIMP_MATRIX_H__
 

libgimpmath/gimpmd5.h

@@ -5,6 +5,10 @@
  * Use of this code is deprecated! Use %GChecksum from GLib instead.
  */
 
+#if !defined (__GIMP_MATH_H_INSIDE__) && !defined (GIMP_MATH_COMPILATION)
+#error "Only <libgimpmath/gimpmath.h> can be included directly."
+#endif
+
 #ifndef __GIMP_MD5_H__
 #define __GIMP_MD5_H__
 

libgimpmath/gimpvector.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_MATH_H_INSIDE__) && !defined (GIMP_MATH_COMPILATION)
+#error "Only <libgimpmath/gimpmath.h> can be included directly."
+#endif
+
 #ifndef __GIMP_VECTOR_H__
 #define __GIMP_VECTOR_H__
 

libgimpmodule/Makefile.am

@@ -42,7 +42,8 @@ endif
 libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpModule\"
+	-DG_LOG_DOMAIN=\"LibGimpModule\"	\
+	-DGIMP_MODULE_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)			\

libgimpmodule/gimpmodule.h

@@ -24,10 +24,14 @@
 
 #include <gmodule.h>
 
+#define __GIMP_MODULE_H_INSIDE__
+
 #include <libgimpmodule/gimpmoduletypes.h>
 
 #include <libgimpmodule/gimpmoduledb.h>
 
+#undef __GIMP_MODULE_H_INSIDE__
+
 G_BEGIN_DECLS
 
 

libgimpmodule/gimpmoduledb.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_MODULE_H_INSIDE__) && !defined (GIMP_MODULE_COMPILATION)
+#error "Only <libgimpmodule/gimpmodule.h> can be included directly."
+#endif
+
 #ifndef __GIMP_MODULE_DB_H__
 #define __GIMP_MODULE_DB_H__
 

libgimpthumb/Makefile.am

@@ -40,7 +40,8 @@ endif
 libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpThumb\"
+	-DG_LOG_DOMAIN=\"LibGimpThumb\"	\
+	-DGIMP_THUMB_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)		\

libgimpthumb/gimpthumb-error.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_THUMB_H_INSIDE__) && !defined (GIMP_THUMB_COMPILATION)
+#error "Only <libgimpthumb/gimpthumb.h> can be included directly."
+#endif
+
 #ifndef __GIMP_THUMB_ERROR_H__
 #define __GIMP_THUMB_ERROR_H__
 

libgimpthumb/gimpthumb-utils.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_THUMB_H_INSIDE__) && !defined (GIMP_THUMB_COMPILATION)
+#error "Only <libgimpthumb/gimpthumb.h> can be included directly."
+#endif
+
 #ifndef __GIMP_THUMB_UTILS_H__
 #define __GIMP_THUMB_UTILS_H__
 

libgimpthumb/gimpthumb.h

@@ -25,11 +25,14 @@
 #ifndef __GIMP_THUMB_H__
 #define __GIMP_THUMB_H__
 
+#define __GIMP_THUMB_H_INSIDE__
+
+#include <libgimpthumb/gimpthumb-types.h>
 
 #include <libgimpthumb/gimpthumb-error.h>
-#include <libgimpthumb/gimpthumb-types.h>
 #include <libgimpthumb/gimpthumb-utils.h>
 #include <libgimpthumb/gimpthumbnail.h>
 
+#undef __GIMP_THUMB_H_INSIDE__
 
 #endif /* __GIMP_THUMB_H__ */

libgimpthumb/gimpthumbnail.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_THUMB_H_INSIDE__) && !defined (GIMP_THUMB_COMPILATION)
+#error "Only <libgimpthumb/gimpthumb.h> can be included directly."
+#endif
+
 #ifndef __GIMP_THUMBNAIL_H__
 #define __GIMP_THUMBNAIL_H__
 

libgimpwidgets/Makefile.am

@@ -49,7 +49,8 @@ endif
 libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"LibGimpWidgets\"
+	-DG_LOG_DOMAIN=\"LibGimpWidgets\"	\
+	-DGIMP_WIDGETS_COMPILATION
 
 INCLUDES = \
 	-I$(top_srcdir)	\

libgimpwidgets/gimpbrowser.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_BROWSER_H__
 #define __GIMP_BROWSER_H__
 

libgimpwidgets/gimpbutton.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_BUTTON_H__
 #define __GIMP_BUTTON_H__
 

libgimpwidgets/gimpcairo-utils.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CAIRO_UTILS_H__
 #define __GIMP_CAIRO_UTILS_H__
 

libgimpwidgets/gimpcellrenderercolor.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CELL_RENDERER_COLOR_H__
 #define __GIMP_CELL_RENDERER_COLOR_H__
 

libgimpwidgets/gimpcellrenderertoggle.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CELL_RENDERER_TOGGLE_H__
 #define __GIMP_CELL_RENDERER_TOGGLE_H__
 

libgimpwidgets/gimpchainbutton.h

@@ -27,6 +27,10 @@
  * provides.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_CHAIN_BUTTON_H__
 #define __GIMP_CHAIN_BUTTON_H__
 

libgimpwidgets/gimpcolorarea.h

@@ -24,6 +24,10 @@
  * handles drag'n'drop.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_AREA_H__
 #define __GIMP_COLOR_AREA_H__
 

libgimpwidgets/gimpcolorbutton.h

@@ -25,6 +25,10 @@
  * fully functional wired to the preview button.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_BUTTON_H__
 #define __GIMP_COLOR_BUTTON_H__
 

libgimpwidgets/gimpcolordisplay.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_DISPLAY_H__
 #define __GIMP_COLOR_DISPLAY_H__
 

libgimpwidgets/gimpcolordisplaystack.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_DISPLAY_STACK_H__
 #define __GIMP_COLOR_DISPLAY_STACK_H__
 

libgimpwidgets/gimpcolorhexentry.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_HEX_ENTRY_H__
 #define __GIMP_COLOR_HEX_ENTRY_H__
 

libgimpwidgets/gimpcolornotebook.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_NOTEBOOK_H__
 #define __GIMP_COLOR_NOTEBOOK_H__
 

libgimpwidgets/gimpcolorprofilecombobox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_PROFILE_COMBO_BOX_H__
 #define __GIMP_COLOR_PROFILE_COMBO_BOX_H__
 

libgimpwidgets/gimpcolorprofilestore.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_PROFILE_STORE_H__
 #define __GIMP_COLOR_PROFILE_STORE_H__
 

libgimpwidgets/gimpcolorscale.h

@@ -20,10 +20,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-/* This provides a color preview area. The preview
- * can handle transparency by showing the checkerboard and
- * handles drag'n'drop.
- */
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
 
 #ifndef __GIMP_COLOR_SCALE_H__
 #define __GIMP_COLOR_SCALE_H__

libgimpwidgets/gimpcolorscales.h

@@ -22,6 +22,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_SCALES_H__
 #define __GIMP_COLOR_SCALES_H__
 

libgimpwidgets/gimpcolorselection.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_SELECTION_H__
 #define __GIMP_COLOR_SELECTION_H__
 

libgimpwidgets/gimpcolorselector.h

@@ -23,6 +23,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_COLOR_SELECTOR_H__
 #define __GIMP_COLOR_SELECTOR_H__
 

libgimpwidgets/gimpdialog.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_DIALOG_H__
 #define __GIMP_DIALOG_H__
 

libgimpwidgets/gimpenumcombobox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_ENUM_COMBO_BOX_H__
 #define __GIMP_ENUM_COMBO_BOX_H__
 

libgimpwidgets/gimpenumlabel.h

@@ -19,11 +19,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_ENUM__LABEL_H__
 #define __GIMP_ENUM__LABEL_H__
 
 G_BEGIN_DECLS
 
+
 #define GIMP_TYPE_ENUM_LABEL            (gimp_enum_label_get_type ())
 #define GIMP_ENUM_LABEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ENUM_LABEL, GimpEnumLabel))
 #define GIMP_ENUM_LABEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ENUM_LABEL, GimpEnumLabelClass))
@@ -55,6 +60,7 @@ GtkWidget * gimp_enum_label_new              (GType          enum_type,
 void        gimp_enum_label_set_value        (GimpEnumLabel *label,
                                               gint           value);
 
+
 G_END_DECLS
 
 #endif  /* __GIMP_ENUM_LABEL_H__ */

libgimpwidgets/gimpenumstore.h

@@ -19,11 +19,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_ENUM_STORE_H__
 #define __GIMP_ENUM_STORE_H__
 
 #include <libgimpwidgets/gimpintstore.h>
 
+
 G_BEGIN_DECLS
 
 #define GIMP_TYPE_ENUM_STORE            (gimp_enum_store_get_type ())

libgimpwidgets/gimpenumwidgets.h

@@ -19,11 +19,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_ENUM_WIDGETS_H__
 #define __GIMP_ENUM_WIDGETS_H__
 
 G_BEGIN_DECLS
 
+
 GtkWidget * gimp_enum_radio_box_new               (GType         enum_type,
                                                    GCallback     callback,
                                                    gpointer      callback_data,
@@ -67,6 +72,7 @@ void        gimp_enum_stock_box_set_child_padding (GtkWidget    *stock_box,
                                                    gint          xpad,
                                                    gint          ypad);
 
+
 G_END_DECLS
 
 #endif  /* __GIMP_ENUM_WIDGETS_H__ */

libgimpwidgets/gimpfileentry.h

@@ -21,6 +21,10 @@
 
 #ifndef GIMP_DISABLE_DEPRECATED
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_FILE_ENTRY_H__
 #define __GIMP_FILE_ENTRY_H__
 

libgimpwidgets/gimpframe.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_FRAME_H__
 #define __GIMP_FRAME_H__
 

libgimpwidgets/gimphelpui.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_HELP_UI_H__
 #define __GIMP_HELP_UI_H__
 

libgimpwidgets/gimphintbox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_HINT_BOX_H__
 #define __GIMP_HINT_BOX_H__
 

libgimpwidgets/gimpintcombobox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_INT_COMBO_BOX_H__
 #define __GIMP_INT_COMBO_BOX_H__
 

libgimpwidgets/gimpintstore.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_INT_STORE_H__
 #define __GIMP_INT_STORE_H__
 

libgimpwidgets/gimpmemsizeentry.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_MEMSIZE_ENTRY_H__
 #define __GIMP_MEMSIZE_ENTRY_H__
 

libgimpwidgets/gimpnumberpairentry.h

@@ -21,6 +21,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_NUMBER_PAIR_ENTRY_H__
 #define __GIMP_NUMBER_PAIR_ENTRY_H__
 

libgimpwidgets/gimpoffsetarea.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_OFFSET_AREA_H__
 #define __GIMP_OFFSET_AREA_H__
 

libgimpwidgets/gimpoldwidgets.h

@@ -19,18 +19,22 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_OLD_WIDGETS_H__
-#define __GIMP_OLD_WIDGETS_H__
-
 /*  These functions are deprecated and should not be used in newly
  *  written code.
  */
 
 #ifndef GIMP_DISABLE_DEPRECATED
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
+#ifndef __GIMP_OLD_WIDGETS_H__
+#define __GIMP_OLD_WIDGETS_H__
 
 G_BEGIN_DECLS
 
+
 /*
  *  Widget Constructors
  */
@@ -96,9 +100,9 @@ void  gimp_option_menu_set_sensitive (GtkOptionMenu    *option_menu,
 void gimp_menu_item_update           (GtkWidget        *widget,
                                       gpointer          data);
 
+
 G_END_DECLS
 
+#endif /* __GIMP_OLD_WIDGETS_H__ */
 
 #endif /*  GIMP_DISABLE_DEPRECATED  */
-
-#endif /* __GIMP_OLD_WIDGETS_H__ */

libgimpwidgets/gimppageselector.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PAGE_SELECTOR_H__
 #define __GIMP_PAGE_SELECTOR_H__
 

libgimpwidgets/gimppatheditor.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PATH_EDITOR_H__
 #define __GIMP_PATH_EDITOR_H__
 

libgimpwidgets/gimppickbutton.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PICK_BUTTON_H__
 #define __GIMP_PICK_BUTTON_H__
 

libgimpwidgets/gimppixmap.h

@@ -21,6 +21,10 @@
 
 #ifndef GIMP_DISABLE_DEPRECATED
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PIXMAP_H__
 #define __GIMP_PIXMAP_H__
 

libgimpwidgets/gimppreview.h

@@ -18,6 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PREVIEW_H__
 #define __GIMP_PREVIEW_H__
 

libgimpwidgets/gimppreviewarea.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PREVIEW_AREA_H__
 #define __GIMP_PREVIEW_AREA_H__
 

libgimpwidgets/gimppropwidgets.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_PROP_WIDGETS_H__
 #define __GIMP_PROP_WIDGETS_H__
 

libgimpwidgets/gimpquerybox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_QUERY_BOX_H__
 #define __GIMP_QUERY_BOX_H__
 

libgimpwidgets/gimpruler.h

@@ -16,6 +16,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_RULER_H__
 #define __GIMP_RULER_H__
 

libgimpwidgets/gimpscaleentry.h

@@ -20,6 +20,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_SCALE_ENTRY_H__
 #define __GIMP_SCALE_ENTRY_H__
 

libgimpwidgets/gimpscrolledpreview.h

@@ -18,6 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_SCROLLED_PREVIEW_H__
 #define __GIMP_SCROLLED_PREVIEW_H__
 

libgimpwidgets/gimpsizeentry.h

@@ -20,6 +20,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_SIZE_ENTRY_H__
 #define __GIMP_SIZE_ENTRY_H__
 

libgimpwidgets/gimpstock.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_STOCK_H__
 #define __GIMP_STOCK_H__
 

libgimpwidgets/gimpstringcombobox.h

@@ -19,6 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_STRING_COMBO_BOX_H__
 #define __GIMP_STRING_COMBO_BOX_H__
 

libgimpwidgets/gimpunitcombobox.h

@@ -19,9 +19,15 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_UNIT_COMBO_BOX_H__
 #define __GIMP_UNIT_COMBO_BOX_H__
 
+G_BEGIN_DECLS
+
 
 #define GIMP_TYPE_UNIT_COMBO_BOX            (gimp_unit_combo_box_get_type ())
 #define GIMP_UNIT_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNIT_COMBO_BOX, GimpUnitComboBox))
@@ -60,4 +66,6 @@ void        gimp_unit_combo_box_set_active     (GimpUnitComboBox *combo,
                                                 GimpUnit          unit);
 
 
+G_END_DECLS
+
 #endif  /* __GIMP_UNIT_COMBO_BOX_H__ */

libgimpwidgets/gimpunitmenu.h

@@ -21,6 +21,10 @@
 
 #ifndef GIMP_DISABLE_DEPRECATED
 
+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_UNIT_MENU_H__
 #define __GIMP_UNIT_MENU_H__