diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index ca60507962..4b99ace0d1 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,12 +1,17 @@
+2000-08-24  Sven Neumann  <sven@gimp.org>
+
+	* libgimp/*: updated after libgimp API cleanup, moved all
+	compatibility definitions into gimpcompat.sgml.
+
 2000-07-29  Michael Natterer  <mitch@gimp.org>
 
-	* libgimp-decl.txt
-	* libgimp-sections.txt
-	* tmpl/gimp.sgml
-	* tmpl/gimpdrawable.sgml
-	* tmpl/gimpenums.sgml
-	* tmpl/gimpimage.sgml
-	* tmpl/gimplayer.sgml: updated from the libgimp sources.
+	* libgimp/libgimp-decl.txt
+	* libgimp/libgimp-sections.txt
+	* libgimp/tmpl/gimp.sgml
+	* libgimp/tmpl/gimpdrawable.sgml
+	* libgimp/tmpl/gimpenums.sgml
+	* libgimp/tmpl/gimpimage.sgml
+	* libgimp/tmpl/gimplayer.sgml: updated from the libgimp sources.
 
 2000-06-24  Sven Neumann  <sven@gimp.org>
 
@@ -25,13 +30,13 @@
 
 2000-06-09  Sven Neumann  <sven@gimp.org>
 
-	* libgimp/libgimp-decl.txt
-	* libgimp/libgimp-sections.txt
-	* tmpl/gimp.sgml
-	* tmpl/gimpchannel.sgml
-	* tmpl/gimpdrawable.sgml
-	* tmpl/gimpimage.sgml
-	* tmpl/gimplayer.sgml: relocated defines as happened to
+	* libgimp/libgimp/libgimp-decl.txt
+	* libgimp/libgimp/libgimp-sections.txt
+	* libgimp/tmpl/gimp.sgml
+	* libgimp/tmpl/gimpchannel.sgml
+	* libgimp/tmpl/gimpdrawable.sgml
+	* libgimp/tmpl/gimpimage.sgml
+	* libgimp/tmpl/gimplayer.sgml: relocated defines as happened to
 	reflect changes in libgimp
 
 2000-06-08  Sven Neumann  <sven@gimp.org>
diff --git a/devel-docs/libgimp/libgimp-decl.txt b/devel-docs/libgimp/libgimp-decl.txt
index 97320549ec..7d65d0c7c5 100644
--- a/devel-docs/libgimp/libgimp-decl.txt
+++ b/devel-docs/libgimp/libgimp-decl.txt
@@ -1,64 +1,4 @@
 <MACRO>
-<NAME>GIMP_MAJOR_VERSION</NAME>
-#define GIMP_MAJOR_VERSION				(1)
-</MACRO>
-<MACRO>
-<NAME>GIMP_MINOR_VERSION</NAME>
-#define GIMP_MINOR_VERSION				(1)
-</MACRO>
-<MACRO>
-<NAME>GIMP_MICRO_VERSION</NAME>
-#define GIMP_MICRO_VERSION				(24)
-</MACRO>
-<MACRO>
-<NAME>GIMP_VERSION</NAME>
-#define GIMP_VERSION					"1.1.24"
-</MACRO>
-<MACRO>
-<NAME>GIMP_CHECK_VERSION</NAME>
-#define GIMP_CHECK_VERSION(major, minor, micro)	\
-    (GIMP_MAJOR_VERSION > (major) || \
-     (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION > (minor)) || \
-     (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION == (minor) && \
-      GIMP_MICRO_VERSION >= (micro)))
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE</NAME>
-#define GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE		1-1-0
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_PARASITES</NAME>
-#define GIMP_HAVE_PARASITES				1-1-0
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_RESOLUTION_INFO</NAME>
-#define GIMP_HAVE_RESOLUTION_INFO			1-1-0
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_DESTROY_PARAMDEFS</NAME>
-#define GIMP_HAVE_DESTROY_PARAMDEFS			1-1-0
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_FEATURES_1_1_5</NAME>
-#define GIMP_HAVE_FEATURES_1_1_5			1-1-5
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_DEFAULT_DISPLAY</NAME>
-#define GIMP_HAVE_DEFAULT_DISPLAY			1-1-5
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_PIXEL_RGNS_REGISTER2</NAME>
-#define GIMP_HAVE_PIXEL_RGNS_REGISTER2			1-1-5
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_NEW_ENUMS</NAME>
-#define GIMP_HAVE_NEW_ENUMS				1-1-10
-</MACRO>
-<MACRO>
-<NAME>GIMP_HAVE_EXPORT</NAME>
-#define GIMP_HAVE_EXPORT                                1-1-10
-</MACRO>
-<MACRO>
 <NAME>GIMPVAR</NAME>
 #    define GIMPVAR __declspec(dllexport)
 </MACRO>
@@ -82,10 +22,6 @@
 <NAME>gimp_set_data</NAME>
 #define gimp_set_data         gimp_procedural_db_set_data
 </MACRO>
-<MACRO>
-<NAME>gimp_query_procedure</NAME>
-#define gimp_query_procedure  gimp_procedural_db_proc_info
-</MACRO>
 <USER_FUNCTION>
 <NAME>GimpInitProc</NAME>
 <RETURNS>void </RETURNS>
@@ -320,15 +256,30 @@ void
 void
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_request_wakeups</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
 <NAME>gimp_get_progname</NAME>
 <RETURNS>gchar      *</RETURNS>
 void
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_brushes_get_brush_data</NAME>
+<RETURNS>gchar *</RETURNS>
+gchar                 *name,gdouble               *opacity,gint                  *spacing,GimpLayerModeEffects  *paint_mode,gint                  *width,gint                  *height,gint                  *length,guint8               **mask_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_brushes_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar                *brush_callback,gchar                *popup_title,gchar                *initial_brush,gdouble               opacity,gint                  spacing,GimpLayerModeEffects  paint_mode
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_brushes_close_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar                *brush_callback
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_brushes_set_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar                *brush_callback,gchar                *brush_name,gdouble               opacity,gint                  spacing,GimpLayerModeEffects  paint_mode
+</FUNCTION>
 <MACRO>
 <NAME>GIMP_TYPE_CHAIN_BUTTON</NAME>
 #define GIMP_TYPE_CHAIN_BUTTON            (gimp_chain_button_get_type ())
@@ -410,6 +361,989 @@ GimpChainButton   *gcb,gboolean           is_active
 <RETURNS>gboolean  </RETURNS>
 GimpChainButton   *gcb
 </FUNCTION>
+<MACRO>
+<NAME>gimp_channel_get_image_id</NAME>
+#define gimp_channel_get_image_id  gimp_drawable_image
+</MACRO>
+<FUNCTION>
+<NAME>gimp_channel_new</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32    image_ID,gchar    *name,guint     width,guint     height,gdouble   opacity,guchar   *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_copy</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_delete</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_name</NAME>
+<RETURNS>gchar *</RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_name</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,gchar    *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,gboolean  visible
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_show_masked</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_show_masked</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,gboolean  show_masked
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_opacity</NAME>
+<RETURNS>gdouble  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_opacity</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,gdouble   opacity
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_color</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,guchar   *red,guchar   *green,guchar   *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_color</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,guchar    red,guchar    green,guchar    blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_get_tattoo</NAME>
+<RETURNS>gint  </RETURNS>
+gint32    channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_set_tattoo</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    channel_ID,gint      tattoo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_ops_offset</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                drawable_ID,gboolean              wrap_around,GimpChannelOffsetType fill_type,gint                  offset_x,gint                  offset_y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_channel_ops_duplicate</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_brightness_contrast</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,gint                brightness,gint                contrast
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_levels</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpChannelLutType  channel,gint                low_input,gint                high_input,gdouble             gamma,gint                low_output,gint                high_output
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_posterize</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,gint                levels
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_desaturate</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_equalize</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,gboolean            mask_only
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_invert</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_curves_spline</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpChannelLutType  channel,gint                num_points,guint8             *control_pts
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_curves_explicit</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpChannelLutType  channel,gint                num_bytes,guint8             *curve
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_balance</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpTransferMode    transfer_mode,gboolean            preserve_lum,gdouble             cyan_red,gdouble             magenta_green,gdouble             yellow_blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_histogram</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpChannelLutType  channel,gint                start_range,gint                end_range,gdouble            *mean,gdouble            *std_dev,gdouble            *median,gdouble            *pixels,gdouble            *count,gdouble            *percentile
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_hue_saturation</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,GimpHueRange        hue_range,gdouble             hue_offset,gdouble             lightness,gdouble             saturation
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_threshold</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              drawable_ID,gint                low_threshold,gint                high_threshold
+</FUNCTION>
+<MACRO>
+<NAME>GIMP_TYPE_COLOR_BUTTON</NAME>
+#define GIMP_TYPE_COLOR_BUTTON            (gimp_color_button_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GIMP_COLOR_BUTTON</NAME>
+#define GIMP_COLOR_BUTTON(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_COLOR_BUTTON, GimpColorButton))
+</MACRO>
+<MACRO>
+<NAME>GIMP_COLOR_BUTTON_CLASS</NAME>
+#define GIMP_COLOR_BUTTON_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_BUTTON, GimpColorButtonClass))
+</MACRO>
+<MACRO>
+<NAME>GIMP_IS_COLOR_BUTTON</NAME>
+#define GIMP_IS_COLOR_BUTTON(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_COLOR_BUTTON))
+</MACRO>
+<MACRO>
+<NAME>GIMP_IS_COLOR_BUTTON_CLASS</NAME>
+#define GIMP_IS_COLOR_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_BUTTON))
+</MACRO>
+<STRUCT>
+<NAME>GimpColorButton</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpColorButtonClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpColorButtonClass</NAME>
+struct GimpColorButtonClass
+{
+  GtkButtonClass parent_class;
+
+  void (* color_changed) (GimpColorButton *gcb);
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_color_button_get_type</NAME>
+<RETURNS>GtkType  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_button_new</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar   *title,gint     width,gint     height,guchar  *color,gint     bpp
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_button_double_new</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar   *title,gint     width,gint     height,gdouble *color,gint     bpp
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_button_update</NAME>
+<RETURNS>void  </RETURNS>
+GimpColorButton *gcb
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayInit</NAME>
+<RETURNS>void </RETURNS>
+void
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayNew</NAME>
+<RETURNS>gpointer </RETURNS>
+gint          type
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayClone</NAME>
+<RETURNS>gpointer </RETURNS>
+gpointer      cd_ID
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayConvert</NAME>
+<RETURNS>void </RETURNS>
+gpointer      cd_ID,
+						      guchar       *buf,
+						      gint          width,
+						      gint          height,
+						      gint          bpp,
+						      gint          bpl
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayDestroy</NAME>
+<RETURNS>void </RETURNS>
+gpointer      cd_ID
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayFinalize</NAME>
+<RETURNS>void </RETURNS>
+void
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayLoadState</NAME>
+<RETURNS>void </RETURNS>
+gpointer      cd_ID,
+						      GimpParasite *state
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplaySaveState</NAME>
+<RETURNS>GimpParasite *</RETURNS>
+gpointer      cd_ID
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayConfigure</NAME>
+<RETURNS>void </RETURNS>
+gpointer      cd_ID,
+						      GFunc         ok_func,
+						      gpointer      ok_data,
+						      GFunc         cancel_func,
+						      gpointer      cancel_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorDisplayConfigureCancel</NAME>
+<RETURNS>void </RETURNS>
+gpointer      cd_ID
+</USER_FUNCTION>
+<STRUCT>
+<NAME>GimpColorDisplayMethods</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpColorDisplayMethods</NAME>
+struct GimpColorDisplayMethods
+{
+  GimpColorDisplayInit            init;
+  GimpColorDisplayNew             new;
+  GimpColorDisplayClone           clone;
+  GimpColorDisplayConvert         convert;
+  GimpColorDisplayDestroy         destroy;
+  GimpColorDisplayFinalize        finalize;
+  GimpColorDisplayLoadState       load;
+  GimpColorDisplaySaveState       save;
+  GimpColorDisplayConfigure       configure;
+  GimpColorDisplayConfigureCancel cancel;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_color_display_register</NAME>
+<RETURNS>gboolean  </RETURNS>
+const gchar             *name,GimpColorDisplayMethods *methods
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_display_unregister</NAME>
+<RETURNS>gboolean  </RETURNS>
+const gchar             *name
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorSelector_Callback</NAME>
+<RETURNS>void </RETURNS>
+gpointer   data,
+						    gint       r,
+						    gint       g,
+						    gint       b
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorSelector_NewFunc</NAME>
+<RETURNS>GtkWidget *</RETURNS>
+gint       r,
+						    gint       g,
+						    gint       b,
+						    GimpColorSelector_Callback cb,
+						    gpointer   data,
+						    gpointer  *selector_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorSelector_FreeFunc</NAME>
+<RETURNS>void </RETURNS>
+gpointer   selector_data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorSelector_SetColorFunc</NAME>
+<RETURNS>void </RETURNS>
+gpointer   selector_data,
+						    gint       r,
+						    gint       g,
+						    gint       b,
+						    gboolean   set_current
+</USER_FUNCTION>
+<STRUCT>
+<NAME>GimpColorSelectorMethods</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpColorSelectorMethods</NAME>
+struct GimpColorSelectorMethods
+{
+  GimpColorSelector_NewFunc      new;
+  GimpColorSelector_FreeFunc     free;
+  GimpColorSelector_SetColorFunc setcolor;
+};
+</STRUCT>
+<TYPEDEF>
+<NAME>GimpColorSelectorID</NAME>
+typedef gpointer GimpColorSelectorID;
+</TYPEDEF>
+<FUNCTION>
+<NAME>gimp_color_selector_register</NAME>
+<RETURNS>GimpColorSelectorID  </RETURNS>
+const gchar *name,const gchar *help_page,GimpColorSelectorMethods *methods
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpColorSelectorFinishedCB</NAME>
+<RETURNS>void </RETURNS>
+gpointer           finished_data
+</USER_FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_selector_unregister</NAME>
+<RETURNS>gboolean  </RETURNS>
+GimpColorSelectorID  id,GimpColorSelectorFinishedCB  finished_cb,gpointer             finished_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rgb_to_hsv</NAME>
+<RETURNS>void  </RETURNS>
+gint    *red         ,gint    *green       ,gint    *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_hsv_to_rgb</NAME>
+<RETURNS>void  </RETURNS>
+gint    *hue         ,gint    *saturation  ,gint    *value
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rgb_to_hls</NAME>
+<RETURNS>void  </RETURNS>
+gint    *red         ,gint    *green       ,gint    *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rgb_to_l</NAME>
+<RETURNS>gint  </RETURNS>
+gint     red,gint     green,gint     blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_hls_to_rgb</NAME>
+<RETURNS>void  </RETURNS>
+gint    *hue         ,gint    *lightness   ,gint    *saturation
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rgb_to_hsv_double</NAME>
+<RETURNS>void  </RETURNS>
+gdouble *red         ,gdouble *green       ,gdouble *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_hsv_to_rgb_double</NAME>
+<RETURNS>void  </RETURNS>
+gdouble *hue         ,gdouble *saturation,gdouble *value
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rgb_to_hsv4</NAME>
+<RETURNS>void  </RETURNS>
+guchar  *hsv,gdouble *red,gdouble *green,gdouble *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_hsv_to_rgb4</NAME>
+<RETURNS>void  </RETURNS>
+guchar  *rgb,gdouble  hue,gdouble  saturation,gdouble  value
+</FUNCTION>
+<MACRO>
+<NAME>INTENSITY_RED</NAME>
+#define INTENSITY_RED   0.30
+</MACRO>
+<MACRO>
+<NAME>INTENSITY_GREEN</NAME>
+#define INTENSITY_GREEN 0.59
+</MACRO>
+<MACRO>
+<NAME>INTENSITY_BLUE</NAME>
+#define INTENSITY_BLUE  0.11
+</MACRO>
+<MACRO>
+<NAME>INTENSITY</NAME>
+#define INTENSITY(r,g,b) ((r) * INTENSITY_RED   + \
+			  (g) * INTENSITY_GREEN + \
+			  (b) * INTENSITY_BLUE  + 0.001)
+</MACRO>
+<MACRO>
+<NAME>gimp_attach_parasite</NAME>
+#define gimp_attach_parasite		gimp_parasite_attach
+</MACRO>
+<MACRO>
+<NAME>gimp_detach_parasite</NAME>
+#define gimp_detach_parasite		gimp_parasite_detach
+</MACRO>
+<MACRO>
+<NAME>gimp_find_parasite</NAME>
+#define gimp_find_parasite		gimp_parasite_find
+</MACRO>
+<MACRO>
+<NAME>gimp_image_attach_parasite</NAME>
+#define gimp_image_attach_parasite	gimp_image_parasite_attach
+</MACRO>
+<MACRO>
+<NAME>gimp_image_detach_parasite</NAME>
+#define gimp_image_detach_parasite	gimp_image_parasite_detach
+</MACRO>
+<MACRO>
+<NAME>gimp_image_find_parasite</NAME>
+#define gimp_image_find_parasite	gimp_image_parasite_find
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_attach_parasite</NAME>
+#define gimp_drawable_attach_parasite	gimp_drawable_parasite_attach
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_detach_parasite</NAME>
+#define gimp_drawable_detach_parasite	gimp_drawable_parasite_detach
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_find_parasite</NAME>
+#define gimp_drawable_find_parasite	gimp_drawable_parasite_find
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_channel</NAME>
+#define gimp_drawable_channel		gimp_drawable_is_channel
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_gray</NAME>
+#define gimp_drawable_gray		gimp_drawable_is_gray
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_color</NAME>
+#define gimp_drawable_color		gimp_drawable_is_rgb
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_indexed</NAME>
+#define gimp_drawable_indexed		gimp_drawable_is_indexed
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_layer</NAME>
+#define gimp_drawable_layer		gimp_drawable_is_layer
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_layer_mask</NAME>
+#define gimp_drawable_layer_mask	gimp_drawable_is_layer_mask
+</MACRO>
+<MACRO>
+<NAME>gimp_image_disable_undo</NAME>
+#define gimp_image_disable_undo		gimp_image_undo_disable
+</MACRO>
+<MACRO>
+<NAME>gimp_image_enable_undo</NAME>
+#define gimp_image_enable_undo		gimp_image_undo_enable
+</MACRO>
+<MACRO>
+<NAME>gimp_image_freeze_undo</NAME>
+#define gimp_image_freeze_undo		gimp_image_undo_freeze
+</MACRO>
+<MACRO>
+<NAME>gimp_image_thaw_undo</NAME>
+#define gimp_image_thaw_undo		gimp_image_undo_thaw
+</MACRO>
+<MACRO>
+<NAME>gimp_channel_width</NAME>
+#define gimp_channel_width              gimp_drawable_width
+</MACRO>
+<MACRO>
+<NAME>gimp_channel_height</NAME>
+#define gimp_channel_height             gimp_drawable_height
+</MACRO>
+<MACRO>
+<NAME>gimp_channel_get_image_ID</NAME>
+#define gimp_channel_get_image_ID       gimp_drawable_image
+</MACRO>
+<MACRO>
+<NAME>gimp_channel_get_layer_ID</NAME>
+#define gimp_channel_get_layer_ID       -1
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_width</NAME>
+#define gimp_layer_width                gimp_drawable_width
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_height</NAME>
+#define gimp_layer_height               gimp_drawable_height
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_bpp</NAME>
+#define gimp_layer_bpp                  gimp_drawable_bpp
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_type</NAME>
+#define gimp_layer_type                 gimp_drawable_type
+</MACRO>
+<MACRO>
+<NAME>gimp_gradient_get_gradient_data</NAME>
+#define gimp_gradient_get_gradient_data gimp_gradients_get_gradient_data
+</MACRO>
+<MACRO>
+<NAME>gimp_plugin_help_func</NAME>
+#define gimp_plugin_help_func           gimp_standard_help_func
+</MACRO>
+<MACRO>
+<NAME>gimp_query_database</NAME>
+#define gimp_query_database             gimp_procedural_db_query
+</MACRO>
+<MACRO>
+<NAME>gimp_query_procedure</NAME>
+#define gimp_query_procedure            gimp_procedural_db_proc_info
+</MACRO>
+<MACRO>
+<NAME>gimp_query_images</NAME>
+#define gimp_query_images               gimp_image_list
+</MACRO>
+<MACRO>
+<NAME>Parasite</NAME>
+#define Parasite                        GimpParasite
+</MACRO>
+<MACRO>
+<NAME>PARASITE_PERSISTENT</NAME>
+#define PARASITE_PERSISTENT             GIMP_PARASITE_PERSISTENT
+</MACRO>
+<MACRO>
+<NAME>PARASITE_UNDOABLE</NAME>
+#define PARASITE_UNDOABLE               GIMP_PARASITE_UNDOABLE
+</MACRO>
+<MACRO>
+<NAME>PARASITE_ATTACH_PARENT</NAME>
+#define PARASITE_ATTACH_PARENT          GIMP_PARASITE_ATTACH_PARENT
+</MACRO>
+<MACRO>
+<NAME>PARASITE_PARENT_PERSISTENT</NAME>
+#define PARASITE_PARENT_PERSISTENT      GIMP_PARASITE_PARENT_PERSISTENT
+</MACRO>
+<MACRO>
+<NAME>PARASITE_PARENT_UNDOABLE</NAME>
+#define PARASITE_PARENT_UNDOABLE        GIMP_PARASITE_PARENT_UNDOABLE
+</MACRO>
+<MACRO>
+<NAME>PARASITE_ATTACH_GRANDPARENT</NAME>
+#define PARASITE_ATTACH_GRANDPARENT     GIMP_PARASITE_ATTACH_GRANDPARENT
+</MACRO>
+<MACRO>
+<NAME>PARASITE_GRANDPARENT_PERSISTENT</NAME>
+#define PARASITE_GRANDPARENT_PERSISTENT GIMP_PARASITE_GRANDPARENT_PERSISTENT
+</MACRO>
+<MACRO>
+<NAME>PARASITE_GRANDPARENT_UNDOABLE</NAME>
+#define PARASITE_GRANDPARENT_UNDOABLE   GIMP_PARASITE_GRANDPARENT_UNDOABLE
+</MACRO>
+<MACRO>
+<NAME>parasite_new</NAME>
+#define parasite_new                    gimp_parasite_new
+</MACRO>
+<MACRO>
+<NAME>parasite_free</NAME>
+#define parasite_free                   gimp_parasite_free
+</MACRO>
+<MACRO>
+<NAME>parasite_copy</NAME>
+#define parasite_copy                   gimp_parasite_copy
+</MACRO>
+<MACRO>
+<NAME>parasite_compare</NAME>
+#define parasite_compare                gimp_parasite_compare
+</MACRO>
+<MACRO>
+<NAME>parasite_is_type</NAME>
+#define parasite_is_type                gimp_parasite_is_type
+</MACRO>
+<MACRO>
+<NAME>parasite_is_persistent</NAME>
+#define parasite_is_persistent          gimp_parasite_is_persistent
+</MACRO>
+<MACRO>
+<NAME>parasite_is_undoable</NAME>
+#define parasite_is_undoable            gimp_parasite_is_undoable
+</MACRO>
+<MACRO>
+<NAME>parasite_has_flag</NAME>
+#define parasite_has_flag               gimp_parasite_has_flag
+</MACRO>
+<MACRO>
+<NAME>parasite_flags</NAME>
+#define parasite_flags                  gimp_parasite_flags
+</MACRO>
+<MACRO>
+<NAME>parasite_name</NAME>
+#define parasite_name                   gimp_parasite_name
+</MACRO>
+<MACRO>
+<NAME>parasite_data</NAME>
+#define parasite_data                   gimp_parasite_data
+</MACRO>
+<MACRO>
+<NAME>parasite_data_size</NAME>
+#define parasite_data_size              gimp_parasite_data_size
+</MACRO>
+<MACRO>
+<NAME>PIXPIPE_MAXDIM</NAME>
+#define PIXPIPE_MAXDIM                  GIMP_PIXPIPE_MAXDIM
+</MACRO>
+<MACRO>
+<NAME>PixPipeParams</NAME>
+#define PixPipeParams                   GimpPixPipeParams
+</MACRO>
+<MACRO>
+<NAME>pixpipeparams_init</NAME>
+#define pixpipeparams_init              gimp_pixpipe_params_init
+</MACRO>
+<MACRO>
+<NAME>pixpipeparams_parse</NAME>
+#define pixpipeparams_parse             gimp_pixpipe_params_parse
+</MACRO>
+<MACRO>
+<NAME>pixpipeparams_build</NAME>
+#define pixpipeparams_build             gimp_pixpipe_params_build
+</MACRO>
+<MACRO>
+<NAME>GPlugInInfo</NAME>
+#define GPlugInInfo                     GimpPlugInInfo
+</MACRO>
+<MACRO>
+<NAME>GTile</NAME>
+#define GTile                           GimpTile
+</MACRO>
+<MACRO>
+<NAME>GDrawable</NAME>
+#define GDrawable                       GimpDrawable
+</MACRO>
+<MACRO>
+<NAME>GPixelRgn</NAME>
+#define GPixelRgn                       GimpPixelRgn
+</MACRO>
+<MACRO>
+<NAME>GParamColor</NAME>
+#define GParamColor                     GimpParamColor
+</MACRO>
+<MACRO>
+<NAME>GParamRegion</NAME>
+#define GParamRegion                    GimpParamRegion
+</MACRO>
+<MACRO>
+<NAME>GParamData</NAME>
+#define GParamData                      GimpParamData
+</MACRO>
+<MACRO>
+<NAME>GParamDef</NAME>
+#define GParamDef                       GimpParamDef
+</MACRO>
+<MACRO>
+<NAME>GParam</NAME>
+#define GParam                          GimpParam
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_RGB</NAME>
+#define CAN_HANDLE_RGB                  GIMP_EXPORT_CAN_HANDLE_RGB
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_GRAY</NAME>
+#define CAN_HANDLE_GRAY                 GIMP_EXPORT_CAN_HANDLE_GRAY
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_INDEXED</NAME>
+#define CAN_HANDLE_INDEXED              GIMP_EXPORT_CAN_HANDLE_INDEXED
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_ALPHA</NAME>
+#define CAN_HANDLE_ALPHA                GIMP_EXPORT_CAN_HANDLE_ALPHA 
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_LAYERS</NAME>
+#define CAN_HANDLE_LAYERS               GIMP_EXPORT_CAN_HANDLE_LAYERS
+</MACRO>
+<MACRO>
+<NAME>CAN_HANDLE_LAYERS_AS_ANIMATION</NAME>
+#define CAN_HANDLE_LAYERS_AS_ANIMATION  GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION
+</MACRO>
+<MACRO>
+<NAME>NEEDS_ALPHA</NAME>
+#define NEEDS_ALPHA                     GIMP_EXPORT_NEEDS_ALPHA
+</MACRO>
+<MACRO>
+<NAME>EXPORT_CANCEL</NAME>
+#define EXPORT_CANCEL                   GIMP_EXPORT_CANCEL
+</MACRO>
+<MACRO>
+<NAME>EXPORT_IGNORE</NAME>
+#define EXPORT_IGNORE                   GIMP_EXPORT_IGNORE
+</MACRO>
+<MACRO>
+<NAME>EXPORT_EXPORT</NAME>
+#define EXPORT_EXPORT                   GIMP_EXPORT_EXPORT
+</MACRO>
+<FUNCTION>
+<NAME>gimp_convert_rgb</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                  image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_convert_grayscale</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                  image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_convert_indexed</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                  image_ID,GimpConvertDitherType   dither_type,GimpConvertPaletteType  palette_type,gint                    num_cols,gboolean                alpha_dither,gboolean                remove_unused,gchar                  *palette
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dialog_new</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+const gchar        *title,const gchar        *wmclass_name,GimpHelpFunc        help_func,gchar              *help_data,GtkWindowPosition   position,gint                allow_shrink,gint                allow_grow,gint                auto_shrink,...
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dialog_newv</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+const gchar        *title,const gchar        *wmclass_name,GimpHelpFunc        help_func,gchar              *help_data,GtkWindowPosition   position,gint                allow_shrink,gint                allow_grow,gint                auto_shrink,va_list             args
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dialog_set_icon</NAME>
+<RETURNS>void  </RETURNS>
+GtkWindow          *dialog
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dialog_create_action_area</NAME>
+<RETURNS>void  </RETURNS>
+GtkDialog          *dialog,...
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dialog_create_action_areav</NAME>
+<RETURNS>void  </RETURNS>
+GtkDialog          *dialog,va_list             args
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_display_new</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32 image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_display_delete</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32 display_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_displays_flush</NAME>
+<RETURNS>gboolean  </RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>gimp_drawable_offset</NAME>
+#define gimp_drawable_offset    gimp_channel_ops_offset
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_image_id</NAME>
+#define gimp_drawable_image_id  gimp_drawable_image
+</MACRO>
+<MACRO>
+<NAME>gimp_drawable_bpp</NAME>
+#define gimp_drawable_bpp       gimp_drawable_bytes
+</MACRO>
+<STRUCT>
+<NAME>GimpDrawable</NAME>
+struct GimpDrawable
+{
+  gint32    id;            /* drawable ID */
+  guint     width;         /* width of drawble */
+  guint     height;        /* height of drawble */
+  guint     bpp;           /* bytes per pixel of drawable */
+  guint     ntile_rows;    /* # of tile rows */
+  guint     ntile_cols;    /* # of tile columns */
+  GimpTile *tiles;         /* the normal tiles */
+  GimpTile *shadow_tiles;  /* the shadow tiles */
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_drawable_get</NAME>
+<RETURNS>GimpDrawable  *</RETURNS>
+gint32        drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_detach</NAME>
+<RETURNS>void  </RETURNS>
+GimpDrawable *drawable
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_flush</NAME>
+<RETURNS>void  </RETURNS>
+GimpDrawable *drawable
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_delete</NAME>
+<RETURNS>void  </RETURNS>
+GimpDrawable *drawable
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_name</NAME>
+<RETURNS>gchar         *</RETURNS>
+gint32        drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32        drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_set_name</NAME>
+<RETURNS>void  </RETURNS>
+gint32        drawable_ID,gchar        *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_set_visible</NAME>
+<RETURNS>void  </RETURNS>
+gint32        drawable_ID,gboolean      visible
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_get_tile</NAME>
+<RETURNS>GimpTile      *</RETURNS>
+GimpDrawable *drawable,gint          shadow,gint          row,gint          col
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_get_tile2</NAME>
+<RETURNS>GimpTile      *</RETURNS>
+GimpDrawable *drawable,gint          shadow,gint          x,gint          y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_get_thumbnail_data</NAME>
+<RETURNS>guchar        *</RETURNS>
+gint32        drawable_ID,gint         *width,gint         *height,gint         *bpp
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_merge_shadow</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID,gboolean       undo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_fill</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID,GimpFillType   fill_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_update</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID,gint           x,gint           y,gint           width,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_mask_bounds</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID,gint          *x1,gint          *y1,gint          *x2,gint          *y2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_image</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_type</NAME>
+<RETURNS>GimpImageType  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_has_alpha</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_type_with_alpha</NAME>
+<RETURNS>GimpImageType  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_rgb</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_gray</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_indexed</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_bytes</NAME>
+<RETURNS>gint  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_width</NAME>
+<RETURNS>gint  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_height</NAME>
+<RETURNS>gint  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_offsets</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID,gint          *offset_x,gint          *offset_y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_layer_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_is_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32         drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_cut</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32       drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_copy</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32       drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_paste</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32       drawable_ID,gboolean     paste_into
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_clear</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32       drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_fill</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32       drawable_ID,GimpFillType fill_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_edit_stroke</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32       drawable_ID
+</FUNCTION>
 <ENUM>
 <NAME>GimpAddMaskType</NAME>
 typedef enum
@@ -1147,22 +2081,22 @@ GList     *path
 <NAME>GimpExportCapabilities</NAME>
 typedef enum
 {
-  CAN_HANDLE_RGB                 = 1 << 0,
-  CAN_HANDLE_GRAY                = 1 << 1,
-  CAN_HANDLE_INDEXED             = 1 << 2,
-  CAN_HANDLE_ALPHA               = 1 << 3,
-  CAN_HANDLE_LAYERS              = 1 << 4,
-  CAN_HANDLE_LAYERS_AS_ANIMATION = 1 << 5,
-  NEEDS_ALPHA                    = 1 << 6
+  GIMP_EXPORT_CAN_HANDLE_RGB                 = 1 << 0,
+  GIMP_EXPORT_CAN_HANDLE_GRAY                = 1 << 1,
+  GIMP_EXPORT_CAN_HANDLE_INDEXED             = 1 << 2,
+  GIMP_EXPORT_CAN_HANDLE_ALPHA               = 1 << 3,
+  GIMP_EXPORT_CAN_HANDLE_LAYERS              = 1 << 4,
+  GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION = 1 << 5,
+  GIMP_EXPORT_NEEDS_ALPHA                    = 1 << 6
 } GimpExportCapabilities;
 </ENUM>
 <ENUM>
 <NAME>GimpExportReturnType</NAME>
 typedef enum
 {
-  EXPORT_CANCEL,
-  EXPORT_IGNORE,
-  EXPORT_EXPORT
+  GIMP_EXPORT_CANCEL,
+  GIMP_EXPORT_IGNORE,
+  GIMP_EXPORT_EXPORT
 } GimpExportReturnType;
 </ENUM>
 <FUNCTION>
@@ -1170,6 +2104,21 @@ typedef enum
 <RETURNS>GimpExportReturnType  </RETURNS>
 gint32                 *image_ID,gint32                 *drawable_ID,gchar                  *format_name,GimpExportCapabilities  capabilities
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_register_magic_load_handler</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *procedure_name,gchar *extensions,gchar *prefixes,gchar *magics
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_register_load_handler</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *procedure_name,gchar *extensions,gchar *prefixes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_register_save_handler</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *procedure_name,gchar *extensions,gchar *prefixes
+</FUNCTION>
 <MACRO>
 <NAME>GIMP_TYPE_FILE_SELECTION</NAME>
 #define GIMP_TYPE_FILE_SELECTION            (gimp_file_selection_get_type ())
@@ -1247,6 +2196,662 @@ GimpFileSelection *gfs
 <RETURNS>void  </RETURNS>
 GimpFileSelection *gfs,gchar             *filename
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_remove</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   floating_sel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_anchor</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   floating_sel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_to_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   floating_sel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_attach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   layer_ID,gint32   drawable_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_rigor</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   floating_sel_ID,gboolean undo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_floating_sel_relax</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32   floating_sel_ID,gboolean undo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gimprc_query</NAME>
+<RETURNS>gchar *</RETURNS>
+gchar   *token
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gimprc_set</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar   *token,gchar   *value
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_get_monitor_resolution</NAME>
+<RETURNS>gboolean  </RETURNS>
+gdouble *xres,gdouble *yres
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_get_list</NAME>
+<RETURNS>gchar **</RETURNS>
+gint    *num_gradients
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_get_active</NAME>
+<RETURNS>gchar *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_set_active</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar   *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_sample_uniform</NAME>
+<RETURNS>gdouble *</RETURNS>
+gint     num_samples
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_sample_custom</NAME>
+<RETURNS>gdouble *</RETURNS>
+gint     num_samples,gdouble *positions
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_get_gradient_data</NAME>
+<RETURNS>gchar  *</RETURNS>
+gchar    *name,gint     *width,gint      sample_size,gdouble **grad_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar    *gradients_callback,gchar    *popup_title,gchar    *initial_gradient,gint      sample_size
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_close_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar    *gradients_callback
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_gradients_set_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar    *gradients_callback,gchar    *gradient_name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_add_hguide</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32 image_ID,gint   yposition
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_add_vguide</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32 image_ID,gint   xposition
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_delete_guide</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32 image_ID,gint32 guide_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_find_next_guide</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32 image_ID,gint32 guide_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_guide_orientation</NAME>
+<RETURNS>GimpOrientationType  </RETURNS>
+gint32 image_ID,gint32 guide_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_guide_position</NAME>
+<RETURNS>gint  </RETURNS>
+gint32 image_ID,gint32 guide_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *prog_name,gchar *help_page
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpHelpFunc</NAME>
+<RETURNS>void </RETURNS>
+gchar *help_data
+</USER_FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_init</NAME>
+<RETURNS>void  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_free</NAME>
+<RETURNS>void  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_enable_tooltips</NAME>
+<RETURNS>void  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_disable_tooltips</NAME>
+<RETURNS>void  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_standard_help_func</NAME>
+<RETURNS>void  </RETURNS>
+gchar        *help_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_connect_help_accel</NAME>
+<RETURNS>void  </RETURNS>
+GtkWidget    *widget,GimpHelpFunc  help_func,gchar        *help_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_help_set_help_data</NAME>
+<RETURNS>void  </RETURNS>
+GtkWidget    *widget,const gchar  *tooltip,gchar        *help_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_context_help</NAME>
+<RETURNS>void  </RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>gimp_image_convert_rgb</NAME>
+#define gimp_image_convert_rgb        gimp_convert_rgb
+</MACRO>
+<MACRO>
+<NAME>gimp_image_convert_grayscale</NAME>
+#define gimp_image_convert_grayscale  gimp_convert_grayscale
+</MACRO>
+<MACRO>
+<NAME>gimp_image_convert_indexed</NAME>
+#define gimp_image_convert_indexed    gimp_convert_indexed
+</MACRO>
+<MACRO>
+<NAME>gimp_image_duplicate</NAME>
+#define gimp_image_duplicate          gimp_channel_ops_duplicate
+</MACRO>
+<FUNCTION>
+<NAME>gimp_image_get_cmap</NAME>
+<RETURNS>guchar    *</RETURNS>
+gint32  image_ID,gint   *num_colors
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_cmap</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32  image_ID,guchar *cmap,gint    num_colors
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_thumbnail_data</NAME>
+<RETURNS>guchar    *</RETURNS>
+gint32  image_ID,gint   *width,gint   *height,gint   *bpp
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_list</NAME>
+<RETURNS>gint *</RETURNS>
+gint               *num_images
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_new</NAME>
+<RETURNS>gint32  </RETURNS>
+gint                width,gint                height,GimpImageBaseType   type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_resize</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint                new_width,gint                new_height,gint                offx,gint                offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_scale</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint                new_width,gint                new_height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_delete</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_free_shadow</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_layers</NAME>
+<RETURNS>gint *</RETURNS>
+gint32              image_ID,gint               *num_layers
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_channels</NAME>
+<RETURNS>gint *</RETURNS>
+gint32              image_ID,gint               *num_channels
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_unset_active_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_pick_correlate_layer</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID,gint                x,gint                y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_raise_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_lower_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_raise_layer_to_top</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_lower_layer_to_bottom</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_merge_visible_layers</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID,GimpMergeType       merge_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_merge_down</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID,gint32              merge_layer_ID,GimpMergeType       merge_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_flatten</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_add_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID,gint                position
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_remove_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_add_layer_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID,gint32              mask_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_remove_layer_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID,GimpMaskApplyMode   mode
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_raise_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_lower_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_add_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              channel_ID,gint                position
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_remove_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_active_drawable</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_base_type</NAME>
+<RETURNS>GimpImageBaseType  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_undo_is_enabled</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_undo_enable</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_undo_disable</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_undo_freeze</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_undo_thaw</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_clean_all</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_floating_selection</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_floating_sel_attached_to</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_tattoo_state</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint                tattoo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_tattoo_state</NAME>
+<RETURNS>gint  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_width</NAME>
+<RETURNS>gint  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_height</NAME>
+<RETURNS>gint  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_active_layer</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_active_layer</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              active_layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_active_channel</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_active_channel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gint32              active_channel_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_selection</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_component_active</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,GimpChannelType     component
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_component_active</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,GimpChannelType     component,gboolean            active
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_component_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,GimpChannelType     component
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_component_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,GimpChannelType     component,gboolean            visible
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_filename</NAME>
+<RETURNS>gchar *</RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_filename</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gchar              *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_resolution</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gdouble            *xresolution,gdouble            *yresolution
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_resolution</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,gdouble             xresolution,gdouble             yresolution
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_unit</NAME>
+<RETURNS>GimpUnit  </RETURNS>
+gint32              image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_set_unit</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32              image_ID,GimpUnit            unit
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_layer_by_tattoo</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID,gint                tattoo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_get_channel_by_tattoo</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32              image_ID,gint                tattoo
+</FUNCTION>
+<MACRO>
+<NAME>gimp_layer_get_mask_id</NAME>
+#define gimp_layer_get_mask_id               gimp_layer_mask
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_get_image_id</NAME>
+#define gimp_layer_get_image_id              gimp_drawable_image
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_is_floating_selection</NAME>
+#define gimp_layer_is_floating_selection     gimp_layer_is_floating_sel
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_get_preserve_transparency</NAME>
+#define gimp_layer_get_preserve_transparency gimp_layer_get_preserve_trans
+</MACRO>
+<MACRO>
+<NAME>gimp_layer_set_preserve_transparency</NAME>
+#define gimp_layer_set_preserve_transparency gimp_layer_set_preserve_trans
+</MACRO>
+<FUNCTION>
+<NAME>gimp_layer_new</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                image_ID,gchar                *name,gint                  width,gint                  height,GimpImageType         type,gdouble               opacity,GimpLayerModeEffects  mode
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_copy</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_create_mask</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                layer_ID,GimpAddMaskType       mask_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_scale</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gint                  new_width,gint                  new_height,gboolean              local_origin
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_resize</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gint                  new_width,gint                  new_height,gint                  offx,gint                  offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_delete</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_translate</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gint                  offx,gint                  offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_add_alpha</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_offsets</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gint                  offx,gint                  offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_mask</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_is_floating_sel</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_name</NAME>
+<RETURNS>gchar *</RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_name</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gchar                *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_visible</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              visible
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_preserve_trans</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_preserve_trans</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              preserve_trans
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_apply_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_apply_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              apply_mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_show_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_show_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              show_mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_edit_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_edit_mask</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              edit_mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_opacity</NAME>
+<RETURNS>gdouble  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_opacity</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gdouble               opacity
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_mode</NAME>
+<RETURNS>GimpLayerModeEffects  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_mode</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,GimpLayerModeEffects  mode
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_linked</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_linked</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gboolean              linked
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_get_tattoo</NAME>
+<RETURNS>gint  </RETURNS>
+gint32                layer_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_layer_set_tattoo</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                layer_ID,gint                  tattoo
+</FUNCTION>
 <MACRO>
 <NAME>GIMP_MIN_IMAGE_SIZE</NAME>
 #define GIMP_MIN_IMAGE_SIZE  1
@@ -1556,6 +3161,26 @@ GtkWidget  *widget
 <RETURNS>void  </RETURNS>
 GtkWidget  *widget,gchar      *gname
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_message</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar                  *message
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_message_get_handler</NAME>
+<RETURNS>GimpMessageHandlerType  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_message_set_handler</NAME>
+<RETURNS>gboolean  </RETURNS>
+GimpMessageHandlerType  handler
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_version</NAME>
+<RETURNS>gchar *</RETURNS>
+void
+</FUNCTION>
 <ENUM>
 <NAME>GimpModuleStatus</NAME>
 typedef enum
@@ -1597,6 +3222,241 @@ gpointer               shutdown_data,
 					GimpModuleCompletedCB  completed_cb,
 					gpointer               completed_data
 </USER_FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_get_foreground</NAME>
+<RETURNS>gboolean  </RETURNS>
+guchar *red,guchar *green,guchar *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_get_background</NAME>
+<RETURNS>gboolean  </RETURNS>
+guchar *red,guchar *green,guchar *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_set_foreground</NAME>
+<RETURNS>gboolean  </RETURNS>
+guchar  red,guchar  green,guchar  blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_set_background</NAME>
+<RETURNS>gboolean  </RETURNS>
+guchar  red,guchar  green,guchar  blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_set_default_colors</NAME>
+<RETURNS>gboolean  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_swap_colors</NAME>
+<RETURNS>gboolean  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_palette_refresh</NAME>
+<RETURNS>gboolean  </RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>GIMP_PARASITE_PERSISTENT</NAME>
+#define GIMP_PARASITE_PERSISTENT 1
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_UNDOABLE</NAME>
+#define GIMP_PARASITE_UNDOABLE   2
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_ATTACH_PARENT</NAME>
+#define GIMP_PARASITE_ATTACH_PARENT     (0x80 << 8)
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_PARENT_PERSISTENT</NAME>
+#define GIMP_PARASITE_PARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 8)
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_PARENT_UNDOABLE</NAME>
+#define GIMP_PARASITE_PARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 8)
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_ATTACH_GRANDPARENT</NAME>
+#define GIMP_PARASITE_ATTACH_GRANDPARENT     (0x80 << 16)
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_GRANDPARENT_PERSISTENT</NAME>
+#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
+</MACRO>
+<MACRO>
+<NAME>GIMP_PARASITE_GRANDPARENT_UNDOABLE</NAME>
+#define GIMP_PARASITE_GRANDPARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 16)
+</MACRO>
+<STRUCT>
+<NAME>GimpParasite</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpParasite</NAME>
+struct GimpParasite
+{
+  gchar    *name;   /* The name of the parasite. USE A UNIQUE PREFIX! */
+  guint32   flags;  /* save Parasite in XCF file, etc.                */
+  guint32   size;   /* amount of data                                 */
+  gpointer  data;   /* a pointer to the data.  plugin is              *
+		     * responsible for tracking byte order            */
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_parasite_new</NAME>
+<RETURNS>GimpParasite  *</RETURNS>
+const gchar        *name,guint32             flags,guint32             size,const gpointer      data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_free</NAME>
+<RETURNS>void  </RETURNS>
+GimpParasite       *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_copy</NAME>
+<RETURNS>GimpParasite  *</RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_compare</NAME>
+<RETURNS>gboolean  </RETURNS>
+const GimpParasite *a,const GimpParasite *b
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_is_type</NAME>
+<RETURNS>gboolean  </RETURNS>
+const GimpParasite *parasite,const gchar        *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_is_persistent</NAME>
+<RETURNS>gboolean  </RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_is_undoable</NAME>
+<RETURNS>gboolean  </RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_has_flag</NAME>
+<RETURNS>gboolean  </RETURNS>
+const GimpParasite *parasite,gulong              flag
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_flags</NAME>
+<RETURNS>gulong  </RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_name</NAME>
+<RETURNS>const gchar   *</RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_data</NAME>
+<RETURNS>gpointer  </RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_data_size</NAME>
+<RETURNS>glong  </RETURNS>
+const GimpParasite *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_attach_new_parasite</NAME>
+<RETURNS>void  </RETURNS>
+const gchar        *name,gint                flags,gint                size,const gpointer      data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_attach_new_parasite</NAME>
+<RETURNS>void  </RETURNS>
+gint32              drawable_ID,const gchar        *name,gint                flags,gint                size,const gpointer      data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_attach_new_parasite</NAME>
+<RETURNS>void  </RETURNS>
+gint32              image_ID,const gchar        *name,gint                flags,gint                size,const gpointer      data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_find</NAME>
+<RETURNS>GimpParasite *</RETURNS>
+gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_attach</NAME>
+<RETURNS>gboolean  </RETURNS>
+GimpParasite   *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_detach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_parasite_list</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint           *num_parasites,gchar        ***parasites
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_parasite_find</NAME>
+<RETURNS>GimpParasite *</RETURNS>
+gint32          drawable_ID,gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_parasite_attach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          drawable_ID,GimpParasite   *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_parasite_detach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          drawable_ID,gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_drawable_parasite_list</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          drawable_ID,gint           *num_parasites,gchar        ***parasites
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_parasite_find</NAME>
+<RETURNS>GimpParasite *</RETURNS>
+gint32          image_ID,gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_parasite_attach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          image_ID,GimpParasite   *parasite
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_parasite_detach</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          image_ID,gchar          *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_image_parasite_list</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32          image_ID,gint           *num_parasites,gchar        ***parasites
+</FUNCTION>
+<MACRO>
+<NAME>GIMP_PIXPIPE_MAXDIM</NAME>
+#define GIMP_PIXPIPE_MAXDIM 4
+</MACRO>
+<FUNCTION>
+<NAME>gimp_pixpipe_params_init</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixPipeParams *params
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixpipe_params_parse</NAME>
+<RETURNS>void  </RETURNS>
+gchar             *parameters,GimpPixPipeParams *params
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixpipe_params_build</NAME>
+<RETURNS>gchar  *</RETURNS>
+GimpPixPipeParams *params
+</FUNCTION>
 <MACRO>
 <NAME>GIMP_TYPE_PATH_EDITOR</NAME>
 #define GIMP_TYPE_PATH_EDITOR            (gimp_path_editor_get_type ())
@@ -1668,6 +3528,293 @@ gchar          *filesel_title,gchar          *path
 <RETURNS>gchar      *</RETURNS>
 GimpPathEditor *gpe
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_list</NAME>
+<RETURNS>gchar **</RETURNS>
+gint32    image_ID,gint     *num_paths
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_get_points</NAME>
+<RETURNS>gint  </RETURNS>
+gint32    image_ID,gchar    *pathname,gint     *path_closed,gint     *num_path_point_details,gdouble **points_pairs
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_get_current</NAME>
+<RETURNS>gchar *</RETURNS>
+gint32    image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_set_current</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gchar    *set_current_path_name
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_set_points</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gchar    *pathname,gint      ptype,gint      num_path_points,gdouble  *points_pairs
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_stroke_current</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_get_point_at_dist</NAME>
+<RETURNS>gint  </RETURNS>
+gint32    image_ID,gdouble   distance,gint     *y_point,gdouble  *gradient
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_get_tattoo</NAME>
+<RETURNS>gint  </RETURNS>
+gint32    image_ID,gchar    *pathname
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_get_path_by_tattoo</NAME>
+<RETURNS>gchar *</RETURNS>
+gint32    image_ID,gint      tattoo
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_delete</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gchar    *path_name_to_del
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_get_locked</NAME>
+<RETURNS>gint  </RETURNS>
+gint32    image_ID,gchar    *pathname
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_set_locked</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gchar    *pathname,gint      lockstatus
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_path_set_tattoo</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gchar    *pathname,gint      tattovalue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_patterns_get_pattern_data</NAME>
+<RETURNS>gchar *</RETURNS>
+gchar   *name,gint    *width,gint    *height,gint    *mask_bpp,gint    *length,guint8 **mask_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_patterns_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *pattern_callback,gchar *popup_title,gchar *initial_pattern
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_patterns_close_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *pattern_callback
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_patterns_set_popup</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar *pattern_callback,gchar *pattern_name
+</FUNCTION>
+<STRUCT>
+<NAME>GimpPixelRgn</NAME>
+struct GimpPixelRgn
+{
+  guchar       *data;          /* pointer to region data */
+  GimpDrawable *drawable;      /* pointer to drawable */
+  guint         bpp;           /* bytes per pixel */
+  guint         rowstride;     /* bytes per pixel row */
+  guint         x, y;          /* origin */
+  guint         w, h;          /* width and height of region */
+  guint         dirty : 1;     /* will this region be dirtied? */
+  guint         shadow : 1;    /* will this region use the shadow or normal tiles */
+  guint         process_count; /* used internally */
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_init</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,GimpDrawable  *drawable,gint           x,gint           y,gint           width,gint           height,gint           dirty,gint           shadow
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_resize</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,gint           x,gint           y,gint           width,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_get_pixel</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_get_row</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_get_col</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_get_rect</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_set_pixel</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_set_row</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_set_col</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgn_set_rect</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width,gint           height
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgns_register</NAME>
+<RETURNS>gpointer  </RETURNS>
+gint           nrgns,...
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgns_register2</NAME>
+<RETURNS>gpointer  </RETURNS>
+gint           nrgns,GimpPixelRgn **prs
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixel_rgns_process</NAME>
+<RETURNS>gpointer  </RETURNS>
+gpointer       pri_ptr
+</FUNCTION>
+<MACRO>
+<NAME>GIMP_TYPE_PIXMAP</NAME>
+#define GIMP_TYPE_PIXMAP            (gimp_pixmap_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GIMP_PIXMAP</NAME>
+#define GIMP_PIXMAP(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PIXMAP, GimpPixmap))
+</MACRO>
+<MACRO>
+<NAME>GIMP_PIXMAP_CLASS</NAME>
+#define GIMP_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIXMAP, GimpPixmapClass))
+</MACRO>
+<MACRO>
+<NAME>GIMP_IS_PIXMAP</NAME>
+#define GIMP_IS_PIXMAP(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PIXMAP))
+</MACRO>
+<MACRO>
+<NAME>GIMP_IS_PIXMAP_CLASS</NAME>
+#define GIMP_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PIXMAP))
+</MACRO>
+<STRUCT>
+<NAME>GimpPixmap</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpPixmapClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpPixmap</NAME>
+struct GimpPixmap
+{
+  GtkPixmap   pixmap;
+
+  gchar     **xpm_data;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GimpPixmapClass</NAME>
+struct GimpPixmapClass
+{
+  GtkPixmapClass parent_class;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_pixmap_get_type</NAME>
+<RETURNS>GtkType  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixmap_new</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar      **xpm_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pixmap_set</NAME>
+<RETURNS>void  </RETURNS>
+GimpPixmap  *pixmap,gchar      **xpm_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_progress_init</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar   *message
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_progress_update</NAME>
+<RETURNS>gboolean  </RETURNS>
+gdouble  percentage
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_temp_PDB_name</NAME>
+<RETURNS>gchar *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_plugin_domain_register</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar   *domain_name,gchar   *domain_path
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_plugin_help_register</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar   *help_path
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_proc_info</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar            *procedure,gchar           **blurb,gchar           **help,gchar           **author,gchar           **copyright,gchar           **date,GimpPDBProcType  *proc_type,gint             *num_args,gint             *num_values,GimpParamDef    **params,GimpParamDef    **return_vals
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_get_data</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar            *identifier,gpointer          data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_set_data</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar            *identifier,gpointer          data,guint32           length
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_dump</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar             *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_query</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar             *name,gchar             *blurb,gchar             *help,gchar             *author,gchar             *copyright,gchar             *date,gchar             *proc_type,gint              *num_matches,gchar           ***procedure_names
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_proc_arg</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar             *procedure,gint               arg_num,GimpPDBArgType    *arg_type,gchar            **arg_name,gchar            **arg_desc
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_proc_val</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar             *procedure,gint               val_num,GimpPDBArgType    *val_type,gchar            **val_name,gchar            **val_desc
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_procedural_db_get_data_size</NAME>
+<RETURNS>gint  </RETURNS>
+gchar             *identifier
+</FUNCTION>
 <MACRO>
 <NAME>GP_VERSION</NAME>
 #define GP_VERSION 0x0004
@@ -1908,11 +4055,105 @@ GIOChannel      *channel,GPProcUninstall *proc_uninstall
 <RETURNS>gboolean  </RETURNS>
 GIOChannel      *channel
 </FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpQueryStringCallback</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *query_box,
+					   gchar     *string,
+					   gpointer   data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpQueryIntCallback</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *query_box,
+					   gint       value,
+					   gpointer   data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpQueryDoubleCallback</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *query_box,
+					   gdouble    value,
+					   gpointer   data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpQuerySizeCallback</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *query_box,
+					   gdouble    size,
+					   GimpUnit   unit,
+					   gpointer   data
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GimpQueryBooleanCallback</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *query_box,
+					   gboolean   value,
+					   gpointer   data
+</USER_FUNCTION>
 <FUNCTION>
-<NAME>gp_request_wakeups_write</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel
+<NAME>gimp_query_string_box</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gchar                    *initial,GtkObject                *object,gchar                    *signal,GimpQueryStringCallback   callback,gpointer                  data
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_query_int_box</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,char                     *message,gint                      initial,gint                      lower,gint                      upper,GtkObject                *object,gchar                    *signal,GimpQueryIntCallback      callback,gpointer                  data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_query_double_box</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gdouble                   initial,gdouble                   lower,gdouble                   upper,gint                      digits,GtkObject                *object,gchar                    *signal,GimpQueryDoubleCallback   callback,gpointer                  data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_query_size_box</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gdouble                   initial,gdouble                   lower,gdouble                   upper,gint                      digits,GimpUnit                  unit,gdouble                   resolution,gboolean                  dot_for_dot,GtkObject                *object,gchar                    *signal,GimpQuerySizeCallback     callback,gpointer                  data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_query_boolean_box</NAME>
+<RETURNS>GtkWidget  *</RETURNS>
+gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gboolean                  eek,gchar                    *message,gchar                    *true_button,gchar                    *false_button,GtkObject                *object,gchar                    *signal,GimpQueryBooleanCallback  callback,gpointer                  data
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_selection_float</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32 image_ID,gint32 drawable_ID,gint   offx,gint   offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_selection_bounds</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID,gboolean *non_empty,gint     *x1,gint     *y1,gint     *x2,gint     *y2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_selection_is_empty</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_selection_none</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32    image_ID
+</FUNCTION>
+<MACRO>
+<NAME>SA_RESTART</NAME>
+#define SA_RESTART SA_SYSV
+</MACRO>
+<USER_FUNCTION>
+<NAME>GimpSignalHandlerFunc</NAME>
+<RETURNS>void </RETURNS>
+gint signum
+</USER_FUNCTION>
+<FUNCTION>
+<NAME>gimp_signal_private</NAME>
+<RETURNS>GimpSignalHandlerFunc  </RETURNS>
+gint                   signum,GimpSignalHandlerFunc  handler,gint                   flags
+</FUNCTION>
+<MACRO>
+<NAME>gimp_signal_syscallrestart</NAME>
+#define gimp_signal_syscallrestart(signum,handler) gimp_signal_private ((signum), (handler), SA_RESTART)
+</MACRO>
 <MACRO>
 <NAME>GIMP_TYPE_SIZE_ENTRY</NAME>
 #define GIMP_TYPE_SIZE_ENTRY            (gimp_size_entry_get_type ())
@@ -2061,10 +4302,269 @@ GimpSizeEntry *gse,GimpUnit       unit
 GimpSizeEntry *gse
 </FUNCTION>
 <FUNCTION>
+<NAME>gimp_text_fontname</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32        image_ID,gint32        drawable_ID,gdouble       x,gdouble       y,gchar        *text,gint          border,gboolean      antialias,gdouble       size,GimpSizeType  size_type,gchar        *fontname
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_text_get_extents_fontname</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar        *text,gdouble       size,GimpSizeType  size_type,gchar        *fontname,gint         *width,gint         *height,gint         *ascent,gint         *descent
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_text</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32        image_ID,gint32        drawable_ID,gdouble       x,gdouble       y,gchar        *text,gint          border,gboolean      antialias,gdouble       size,GimpSizeType  size_type,gchar        *foundry,gchar        *family,gchar        *weight,gchar        *slant,gchar        *set_width,gchar        *spacing,gchar        *registry,gchar        *encoding
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_text_get_extents</NAME>
+<RETURNS>gboolean  </RETURNS>
+gchar        *text,gdouble       size,GimpSizeType  size_type,gchar        *foundry,gchar        *family,gchar        *weight,gchar        *slant,gchar        *set_width,gchar        *spacing,gchar        *registry,gchar        *encoding,gint         *width,gint         *height,gint         *ascent,gint         *descent
+</FUNCTION>
+<STRUCT>
+<NAME>GimpTile</NAME>
+struct GimpTile
+{
+  guint         ewidth;     /* the effective width of the tile */
+  guint         eheight;    /* the effective height of the tile */
+  guint         bpp;        /* the bytes per pixel (1, 2, 3 or 4 ) */
+  guint         tile_num;   /* the number of this tile within the drawable */
+  guint16       ref_count;  /* reference count for the tile */
+  guint         dirty : 1;  /* is the tile dirty? has it been modified? */
+  guint         shadow: 1;  /* is this a shadow tile */
+  guchar       *data;       /* the pixel data for the tile */
+  GimpDrawable *drawable;   /* the drawable this tile came from */
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gimp_tile_ref</NAME>
+<RETURNS>void  </RETURNS>
+GimpTile  *tile
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_ref_zero</NAME>
+<RETURNS>void  </RETURNS>
+GimpTile  *tile
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_unref</NAME>
+<RETURNS>void  </RETURNS>
+GimpTile  *tile,gboolean   dirty
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_flush</NAME>
+<RETURNS>void  </RETURNS>
+GimpTile  *tile
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_cache_size</NAME>
+<RETURNS>void  </RETURNS>
+gulong     kilobytes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_cache_ntiles</NAME>
+<RETURNS>void  </RETURNS>
+gulong     ntiles
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_width</NAME>
+<RETURNS>guint  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_tile_height</NAME>
+<RETURNS>guint  </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_airbrush</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   pressure,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_airbrush_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_blend</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,GimpBlendMode             blend_mode,GimpLayerModeEffects      paint_mode,GimpGradientType          gradient_type,gdouble                   opacity,gdouble                   offset,GimpRepeatMode            repeat,gboolean                  supersample,gint                      max_depth,gdouble                   threshold,gdouble                   x1,gdouble                   y1,gdouble                   x2,gdouble                   y2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_bucket_fill</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,GimpBucketFillMode        fill_mode,GimpLayerModeEffects      paint_mode,gdouble                   opacity,gdouble                   threshold,gboolean                  sample_merged,gdouble                   x,gdouble                   y
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_by_color_select</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,guchar                    red,guchar                    green,guchar                    blue,gint                      threshold,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius,gboolean                  sample_merged
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_clone</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint32                    src_drawable_ID,GimpCloneType             clone_type,gdouble                   src_x,gdouble                   src_y,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_clone_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_color_picker</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    image_ID,gint32                    drawable_ID,gdouble                   x,gdouble                   y,gboolean                  sample_merged,gboolean                  sample_average,gdouble                   average_radius,gboolean                  save_color,guchar                   *red,guchar                   *green,guchar                   *blue
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_convolve</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   pressure,GimpConvolveType          convolve_type,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_convolve_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_crop</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    image_ID,gint                      new_width,gint                      new_height,gint                      offx,gint                      offy
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dodgeburn</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   exposure,GimpDodgeBurnType         dodgeburn_type,GimpDodgeBurnMode         dodgeburn_mode,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_dodgeburn_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_ellipse_select</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    image_ID,gdouble                   x,gdouble                   y,gdouble                   width,gdouble                   height,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_eraser</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes,GimpBrushApplicationMode  hardness,GimpPaintApplicationMode  method
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_eraser_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_flip</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,GimpOrientationType       flip_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_free_select</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    image_ID,gint                      num_segs,gdouble                  *segs,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_fuzzy_select</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   x,gdouble                   y,gint                      threshold,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius,gboolean                  sample_merged
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_paintbrush</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   fade_out,gint                      num_strokes,gdouble                  *strokes,GimpPaintApplicationMode  method,gdouble                   gradient_length
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_paintbrush_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_pencil</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_perspective</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,gboolean                  interpolation,gdouble                   x0,gdouble                   y0,gdouble                   x1,gdouble                   y1,gdouble                   x2,gdouble                   y2,gdouble                   x3,gdouble                   y3
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rect_select</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    image_ID,gdouble                   x,gdouble                   y,gdouble                   width,gdouble                   height,GimpChannelOps            operation,gboolean                  feather,gdouble                   feather_radius
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_rotate</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,gboolean                  interpolation,gdouble                   angle
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_scale</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,gboolean                  interpolation,gdouble                   x0,gdouble                   y0,gdouble                   x1,gdouble                   y1
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_shear</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,gboolean                  interpolation,GimpOrientationType       shear_type,gdouble                   magnitude
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_smudge</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gdouble                   pressure,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_smudge_default</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_transform_2d</NAME>
+<RETURNS>gint32  </RETURNS>
+gint32                    drawable_ID,gboolean                  interpolation,gdouble                   source_x,gdouble                   source_y,gdouble                   scale_x,gdouble                   scale_y,gdouble                   angle,gdouble                   dest_x,gdouble                   dest_y
+</FUNCTION>
+<STRUCT>
+<NAME>GimpPlugInInfo</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpTile</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpDrawable</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpPixelRgn</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpParamDef</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpParamColor</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpParamRegion</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpParam</NAME>
+</STRUCT>
+<FUNCTION>
 <NAME>gimp_ui_init</NAME>
 <RETURNS>void  </RETURNS>
 gchar    *prog_name,gboolean  preview
 </FUNCTION>
+<FUNCTION>
+<NAME>gimp_undo_push_group_start</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32 image_ID
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_undo_push_group_end</NAME>
+<RETURNS>gboolean  </RETURNS>
+gint32 image_ID
+</FUNCTION>
 <ENUM>
 <NAME>GimpUnit</NAME>
 typedef enum
@@ -2214,734 +4714,163 @@ GimpUnitMenu *gum,GimpUnit      unit
 <RETURNS>GimpUnit  </RETURNS>
 GimpUnitMenu *gum
 </FUNCTION>
+<MACRO>
+<NAME>gimp_strescape</NAME>
+#define gimp_strescape(string, exceptions) g_strescape (string, exceptions)
+</MACRO>
+<MACRO>
+<NAME>gimp_strcompress</NAME>
+#define gimp_strcompress(string)           g_strcompress (string)
+</MACRO>
+<FUNCTION>
+<NAME>gimp_strescape</NAME>
+<RETURNS>gchar  *</RETURNS>
+const gchar *source,const gchar *exceptions
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_strcompress</NAME>
+<RETURNS>gchar  *</RETURNS>
+const gchar *source
+</FUNCTION>
 <STRUCT>
-<NAME>WireMessage</NAME>
+<NAME>GimpVector2</NAME>
 </STRUCT>
-<USER_FUNCTION>
-<NAME>WireReadFunc</NAME>
-<RETURNS>void </RETURNS>
-GIOChannel  *channel,
-				      WireMessage *msg
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>WireWriteFunc</NAME>
-<RETURNS>void </RETURNS>
-GIOChannel  *channel,
-				      WireMessage *msg
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>WireDestroyFunc</NAME>
-<RETURNS>void </RETURNS>
-WireMessage *msg
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>WireIOFunc</NAME>
-<RETURNS>gboolean </RETURNS>
-GIOChannel  *channel,
-				      guint8      *buf,
-				      gulong       count
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>WireFlushFunc</NAME>
-<RETURNS>gboolean </RETURNS>
-GIOChannel  *channel
-</USER_FUNCTION>
 <STRUCT>
-<NAME>WireMessage</NAME>
-struct WireMessage
+<NAME>GimpVector3</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpVector4</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GimpVector2</NAME>
+struct GimpVector2
 {
-  guint32  type;
-  gpointer data;
+  gdouble x, y;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GimpVector3</NAME>
+struct GimpVector3
+{
+  gdouble x, y, z;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GimpVector4</NAME>
+struct GimpVector4
+{
+  gdouble x, y, z, w;
 };
 </STRUCT>
 <FUNCTION>
-<NAME>wire_register</NAME>
+<NAME>gimp_vector2_inner_product</NAME>
+<RETURNS>gdouble  </RETURNS>
+GimpVector2 *vector1,GimpVector2 *vector2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector2_cross_product</NAME>
+<RETURNS>GimpVector2  </RETURNS>
+GimpVector2 *vector1,GimpVector2 *vector2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector2_length</NAME>
+<RETURNS>gdouble  </RETURNS>
+GimpVector2 *vector
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector2_normalize</NAME>
 <RETURNS>void  </RETURNS>
-guint32          type,WireReadFunc     read_func,WireWriteFunc    write_func,WireDestroyFunc  destroy_func
+GimpVector2 *vector
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_set_reader</NAME>
+<NAME>gimp_vector2_mul</NAME>
 <RETURNS>void  </RETURNS>
-WireIOFunc       read_func
+GimpVector2 *vector,gdouble      factor
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_set_writer</NAME>
+<NAME>gimp_vector2_sub</NAME>
 <RETURNS>void  </RETURNS>
-WireIOFunc       write_func
+GimpVector2 *result,GimpVector2 *vector1,GimpVector2 *vector2
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_set_flusher</NAME>
+<NAME>gimp_vector2_set</NAME>
 <RETURNS>void  </RETURNS>
-WireFlushFunc    flush_func
+GimpVector2 *vector,gdouble      x,gdouble      y
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_read</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel	     *channel,guint8          *buf,gulong           count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint8          *buf,gulong           count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_flush</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel	     *channel
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_error</NAME>
-<RETURNS>gboolean  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_clear_error</NAME>
+<NAME>gimp_vector2_add</NAME>
 <RETURNS>void  </RETURNS>
-void
+GimpVector2 *result,GimpVector2 *vector1,GimpVector2 *vector2
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_read_msg</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel	     *channel,WireMessage     *msg
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_msg</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel	     *channel,WireMessage     *msg
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_destroy</NAME>
+<NAME>gimp_vector2_neg</NAME>
 <RETURNS>void  </RETURNS>
-WireMessage     *msg
+GimpVector2 *vector
 </FUNCTION>
 <FUNCTION>
-<NAME>wire_read_int32</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint32         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_read_int16</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel	     *channel,guint16         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_read_int8</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint8          *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_read_double</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,gdouble         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_read_string</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,gchar          **data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_int32</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint32         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_int16</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint16         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_int8</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,guint8          *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_double</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,gdouble         *data,gint             count
-</FUNCTION>
-<FUNCTION>
-<NAME>wire_write_string</NAME>
-<RETURNS>gboolean  </RETURNS>
-GIOChannel      *channel,gchar          **data,gint             count
-</FUNCTION>
-<MACRO>
-<NAME>gimp_attach_parasite</NAME>
-#define gimp_attach_parasite		gimp_parasite_attach
-</MACRO>
-<MACRO>
-<NAME>gimp_detach_parasite</NAME>
-#define gimp_detach_parasite		gimp_parasite_detach
-</MACRO>
-<MACRO>
-<NAME>gimp_find_parasite</NAME>
-#define gimp_find_parasite		gimp_parasite_find
-</MACRO>
-<MACRO>
-<NAME>gimp_image_attach_parasite</NAME>
-#define gimp_image_attach_parasite	gimp_image_parasite_attach
-</MACRO>
-<MACRO>
-<NAME>gimp_image_detach_parasite</NAME>
-#define gimp_image_detach_parasite	gimp_image_parasite_detach
-</MACRO>
-<MACRO>
-<NAME>gimp_image_find_parasite</NAME>
-#define gimp_image_find_parasite	gimp_image_parasite_find
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_attach_parasite</NAME>
-#define gimp_drawable_attach_parasite	gimp_drawable_parasite_attach
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_detach_parasite</NAME>
-#define gimp_drawable_detach_parasite	gimp_drawable_parasite_detach
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_find_parasite</NAME>
-#define gimp_drawable_find_parasite	gimp_drawable_parasite_find
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_channel</NAME>
-#define gimp_drawable_channel		gimp_drawable_is_channel
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_gray</NAME>
-#define gimp_drawable_gray		gimp_drawable_is_gray
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_color</NAME>
-#define gimp_drawable_color		gimp_drawable_is_rgb
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_indexed</NAME>
-#define gimp_drawable_indexed		gimp_drawable_is_indexed
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_layer</NAME>
-#define gimp_drawable_layer		gimp_drawable_is_layer
-</MACRO>
-<MACRO>
-<NAME>gimp_drawable_layer_mask</NAME>
-#define gimp_drawable_layer_mask	gimp_drawable_is_layer_mask
-</MACRO>
-<MACRO>
-<NAME>gimp_image_disable_undo</NAME>
-#define gimp_image_disable_undo		gimp_image_undo_disable
-</MACRO>
-<MACRO>
-<NAME>gimp_image_enable_undo</NAME>
-#define gimp_image_enable_undo		gimp_image_undo_enable
-</MACRO>
-<MACRO>
-<NAME>gimp_image_freeze_undo</NAME>
-#define gimp_image_freeze_undo		gimp_image_undo_freeze
-</MACRO>
-<MACRO>
-<NAME>gimp_image_thaw_undo</NAME>
-#define gimp_image_thaw_undo		gimp_image_undo_thaw
-</MACRO>
-<MACRO>
-<NAME>gimp_channel_width</NAME>
-#define gimp_channel_width              gimp_drawable_width
-</MACRO>
-<MACRO>
-<NAME>gimp_channel_height</NAME>
-#define gimp_channel_height             gimp_drawable_height
-</MACRO>
-<MACRO>
-<NAME>gimp_channel_get_image_ID</NAME>
-#define gimp_channel_get_image_ID       gimp_drawable_image
-</MACRO>
-<MACRO>
-<NAME>gimp_channel_get_layer_ID</NAME>
-#define gimp_channel_get_layer_ID       -1
-</MACRO>
-<MACRO>
-<NAME>gimp_layer_width</NAME>
-#define gimp_layer_width                gimp_drawable_width
-</MACRO>
-<MACRO>
-<NAME>gimp_layer_height</NAME>
-#define gimp_layer_height               gimp_drawable_height
-</MACRO>
-<MACRO>
-<NAME>gimp_layer_bpp</NAME>
-#define gimp_layer_bpp                  gimp_drawable_bpp
-</MACRO>
-<MACRO>
-<NAME>gimp_layer_type</NAME>
-#define gimp_layer_type                 gimp_drawable_type
-</MACRO>
-<MACRO>
-<NAME>gimp_gradient_get_gradient_data</NAME>
-#define gimp_gradient_get_gradient_data gimp_gradients_get_gradient_data
-</MACRO>
-<MACRO>
-<NAME>gimp_plugin_help_func</NAME>
-#define gimp_plugin_help_func           gimp_standard_help_func
-</MACRO>
-<MACRO>
-<NAME>gimp_query_database</NAME>
-#define gimp_query_database             gimp_procedural_db_query
-</MACRO>
-<MACRO>
-<NAME>gimp_query_images</NAME>
-#define gimp_query_images               gimp_image_list
-</MACRO>
-<MACRO>
-<NAME>Parasite</NAME>
-#define Parasite                        GimpParasite
-</MACRO>
-<MACRO>
-<NAME>PARASITE_PERSISTENT</NAME>
-#define PARASITE_PERSISTENT             GIMP_PARASITE_PERSISTENT
-</MACRO>
-<MACRO>
-<NAME>PARASITE_UNDOABLE</NAME>
-#define PARASITE_UNDOABLE               GIMP_PARASITE_UNDOABLE
-</MACRO>
-<MACRO>
-<NAME>PARASITE_ATTACH_PARENT</NAME>
-#define PARASITE_ATTACH_PARENT          GIMP_PARASITE_ATTACH_PARENT
-</MACRO>
-<MACRO>
-<NAME>PARASITE_PARENT_PERSISTENT</NAME>
-#define PARASITE_PARENT_PERSISTENT      GIMP_PARASITE_PARENT_PERSISTENT
-</MACRO>
-<MACRO>
-<NAME>PARASITE_PARENT_UNDOABLE</NAME>
-#define PARASITE_PARENT_UNDOABLE        GIMP_PARASITE_PARENT_UNDOABLE
-</MACRO>
-<MACRO>
-<NAME>PARASITE_ATTACH_GRANDPARENT</NAME>
-#define PARASITE_ATTACH_GRANDPARENT     GIMP_PARASITE_ATTACH_GRANDPARENT
-</MACRO>
-<MACRO>
-<NAME>PARASITE_GRANDPARENT_PERSISTENT</NAME>
-#define PARASITE_GRANDPARENT_PERSISTENT GIMP_PARASITE_GRANDPARENT_PERSISTENT
-</MACRO>
-<MACRO>
-<NAME>PARASITE_GRANDPARENT_UNDOABLE</NAME>
-#define PARASITE_GRANDPARENT_UNDOABLE   GIMP_PARASITE_GRANDPARENT_UNDOABLE
-</MACRO>
-<MACRO>
-<NAME>parasite_new</NAME>
-#define parasite_new                    gimp_parasite_new
-</MACRO>
-<MACRO>
-<NAME>parasite_free</NAME>
-#define parasite_free                   gimp_parasite_free
-</MACRO>
-<MACRO>
-<NAME>parasite_copy</NAME>
-#define parasite_copy                   gimp_parasite_copy
-</MACRO>
-<MACRO>
-<NAME>parasite_compare</NAME>
-#define parasite_compare                gimp_parasite_compare
-</MACRO>
-<MACRO>
-<NAME>parasite_is_type</NAME>
-#define parasite_is_type                gimp_parasite_is_type
-</MACRO>
-<MACRO>
-<NAME>parasite_is_persistent</NAME>
-#define parasite_is_persistent          gimp_parasite_is_persistent
-</MACRO>
-<MACRO>
-<NAME>parasite_is_undoable</NAME>
-#define parasite_is_undoable            gimp_parasite_is_undoable
-</MACRO>
-<MACRO>
-<NAME>parasite_has_flag</NAME>
-#define parasite_has_flag               gimp_parasite_has_flag
-</MACRO>
-<MACRO>
-<NAME>parasite_flags</NAME>
-#define parasite_flags                  gimp_parasite_flags
-</MACRO>
-<MACRO>
-<NAME>parasite_name</NAME>
-#define parasite_name                   gimp_parasite_name
-</MACRO>
-<MACRO>
-<NAME>parasite_data</NAME>
-#define parasite_data                   gimp_parasite_data
-</MACRO>
-<MACRO>
-<NAME>parasite_data_size</NAME>
-#define parasite_data_size              gimp_parasite_data_size
-</MACRO>
-<MACRO>
-<NAME>PIXPIPE_MAXDIM</NAME>
-#define PIXPIPE_MAXDIM                  GIMP_PIXPIPE_MAXDIM
-</MACRO>
-<MACRO>
-<NAME>PixPipeParams</NAME>
-#define PixPipeParams                   GimpPixPipeParams
-</MACRO>
-<MACRO>
-<NAME>pixpipeparams_init</NAME>
-#define pixpipeparams_init              gimp_pixpipe_params_init
-</MACRO>
-<MACRO>
-<NAME>pixpipeparams_parse</NAME>
-#define pixpipeparams_parse             gimp_pixpipe_params_parse
-</MACRO>
-<MACRO>
-<NAME>pixpipeparams_build</NAME>
-#define pixpipeparams_build             gimp_pixpipe_params_build
-</MACRO>
-<MACRO>
-<NAME>GPlugInInfo</NAME>
-#define GPlugInInfo  GimpPlugInInfo
-</MACRO>
-<MACRO>
-<NAME>GTile</NAME>
-#define GTile        GimpTile
-</MACRO>
-<MACRO>
-<NAME>GDrawable</NAME>
-#define GDrawable    GimpDrawable
-</MACRO>
-<MACRO>
-<NAME>GPixelRgn</NAME>
-#define GPixelRgn    GimpPixelRgn
-</MACRO>
-<MACRO>
-<NAME>GParamColor</NAME>
-#define GParamColor  GimpParamColor
-</MACRO>
-<MACRO>
-<NAME>GParamRegion</NAME>
-#define GParamRegion GimpParamRegion
-</MACRO>
-<MACRO>
-<NAME>GParamData</NAME>
-#define GParamData   GimpParamData
-</MACRO>
-<MACRO>
-<NAME>GParamDef</NAME>
-#define GParamDef    GimpParamDef
-</MACRO>
-<MACRO>
-<NAME>GParam</NAME>
-#define GParam       GimpParam
-</MACRO>
-<MACRO>
-<NAME>GIMP_TYPE_COLOR_BUTTON</NAME>
-#define GIMP_TYPE_COLOR_BUTTON            (gimp_color_button_get_type ())
-</MACRO>
-<MACRO>
-<NAME>GIMP_COLOR_BUTTON</NAME>
-#define GIMP_COLOR_BUTTON(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_COLOR_BUTTON, GimpColorButton))
-</MACRO>
-<MACRO>
-<NAME>GIMP_COLOR_BUTTON_CLASS</NAME>
-#define GIMP_COLOR_BUTTON_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_BUTTON, GimpColorButtonClass))
-</MACRO>
-<MACRO>
-<NAME>GIMP_IS_COLOR_BUTTON</NAME>
-#define GIMP_IS_COLOR_BUTTON(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_COLOR_BUTTON))
-</MACRO>
-<MACRO>
-<NAME>GIMP_IS_COLOR_BUTTON_CLASS</NAME>
-#define GIMP_IS_COLOR_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_BUTTON))
-</MACRO>
-<STRUCT>
-<NAME>GimpColorButton</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpColorButtonClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpColorButtonClass</NAME>
-struct GimpColorButtonClass
-{
-  GtkButtonClass parent_class;
-
-  void (* color_changed) (GimpColorButton *gcb);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_color_button_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_button_new</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar   *title,gint     width,gint     height,guchar  *color,gint     bpp
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_button_double_new</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar   *title,gint     width,gint     height,gdouble *color,gint     bpp
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_button_update</NAME>
+<NAME>gimp_vector2_rotate</NAME>
 <RETURNS>void  </RETURNS>
-GimpColorButton *gcb
+GimpVector2 *vector,gdouble      alpha
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_rgb_to_hsv</NAME>
+<NAME>gimp_vector3_inner_product</NAME>
+<RETURNS>gdouble  </RETURNS>
+GimpVector3 *vector1,GimpVector3 *vector2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector3_cross_product</NAME>
+<RETURNS>GimpVector3  </RETURNS>
+GimpVector3 *vector1,GimpVector3 *vector2
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector3_length</NAME>
+<RETURNS>gdouble  </RETURNS>
+GimpVector3 *vector
+</FUNCTION>
+<FUNCTION>
+<NAME>gimp_vector3_normalize</NAME>
 <RETURNS>void  </RETURNS>
-gint    *red         ,gint    *green       ,gint    *blue
+GimpVector3 *vector
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_hsv_to_rgb</NAME>
+<NAME>gimp_vector3_mul</NAME>
 <RETURNS>void  </RETURNS>
-gint    *hue         ,gint    *saturation  ,gint    *value
+GimpVector3 *vector,gdouble      factor
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_rgb_to_hls</NAME>
+<NAME>gimp_vector3_sub</NAME>
 <RETURNS>void  </RETURNS>
-gint    *red         ,gint    *green       ,gint    *blue
+GimpVector3 *result,GimpVector3 *vector1,GimpVector3 *vector2
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_rgb_to_l</NAME>
-<RETURNS>gint  </RETURNS>
-gint     red,gint     green,gint     blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_hls_to_rgb</NAME>
+<NAME>gimp_vector3_set</NAME>
 <RETURNS>void  </RETURNS>
-gint    *hue         ,gint    *lightness   ,gint    *saturation
+GimpVector3 *vector,gdouble      x,gdouble      y,gdouble      z
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_rgb_to_hsv_double</NAME>
+<NAME>gimp_vector3_add</NAME>
 <RETURNS>void  </RETURNS>
-gdouble *red         ,gdouble *green       ,gdouble *blue
+GimpVector3 *result,GimpVector3 *vector1,GimpVector3 *vector2
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_hsv_to_rgb_double</NAME>
+<NAME>gimp_vector3_neg</NAME>
 <RETURNS>void  </RETURNS>
-gdouble *hue         ,gdouble *saturation,gdouble *value
+GimpVector3 *vector
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_rgb_to_hsv4</NAME>
+<NAME>gimp_vector3_rotate</NAME>
 <RETURNS>void  </RETURNS>
-guchar  *hsv,gdouble *red,gdouble *green,gdouble *blue
+GimpVector3 *vector,gdouble      alpha,gdouble      beta,gdouble      gamma
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_hsv_to_rgb4</NAME>
+<NAME>gimp_vector_2d_to_3d</NAME>
 <RETURNS>void  </RETURNS>
-guchar  *rgb,gdouble  hue,gdouble  saturation,gdouble  value
+gint         sx,gint         sy,gint         w,gint         h,gint         x,gint         y,GimpVector3 *vp,GimpVector3 *p
 </FUNCTION>
-<MACRO>
-<NAME>INTENSITY_RED</NAME>
-#define INTENSITY_RED   0.30
-</MACRO>
-<MACRO>
-<NAME>INTENSITY_GREEN</NAME>
-#define INTENSITY_GREEN 0.59
-</MACRO>
-<MACRO>
-<NAME>INTENSITY_BLUE</NAME>
-#define INTENSITY_BLUE  0.11
-</MACRO>
-<MACRO>
-<NAME>INTENSITY</NAME>
-#define INTENSITY(r,g,b) ((r) * INTENSITY_RED   + \
-			  (g) * INTENSITY_GREEN + \
-			  (b) * INTENSITY_BLUE  + 0.001)
-</MACRO>
-<STRUCT>
-<NAME>GimpTile</NAME>
-struct GimpTile
-{
-  guint         ewidth;     /* the effective width of the tile */
-  guint         eheight;    /* the effective height of the tile */
-  guint         bpp;        /* the bytes per pixel (1, 2, 3 or 4 ) */
-  guint         tile_num;   /* the number of this tile within the drawable */
-  guint16       ref_count;  /* reference count for the tile */
-  guint         dirty : 1;  /* is the tile dirty? has it been modified? */
-  guint         shadow: 1;  /* is this a shadow tile */
-  guchar       *data;       /* the pixel data for the tile */
-  GimpDrawable *drawable;   /* the drawable this tile came from */
-};
-</STRUCT>
 <FUNCTION>
-<NAME>gimp_tile_ref</NAME>
+<NAME>gimp_vector_3d_to_2d</NAME>
 <RETURNS>void  </RETURNS>
-GimpTile  *tile
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_ref_zero</NAME>
-<RETURNS>void  </RETURNS>
-GimpTile  *tile
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_unref</NAME>
-<RETURNS>void  </RETURNS>
-GimpTile  *tile,gboolean   dirty
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_flush</NAME>
-<RETURNS>void  </RETURNS>
-GimpTile  *tile
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_cache_size</NAME>
-<RETURNS>void  </RETURNS>
-gulong     kilobytes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_cache_ntiles</NAME>
-<RETURNS>void  </RETURNS>
-gulong     ntiles
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_width</NAME>
-<RETURNS>guint  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_tile_height</NAME>
-<RETURNS>guint  </RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>GIMP_TYPE_PIXMAP</NAME>
-#define GIMP_TYPE_PIXMAP            (gimp_pixmap_get_type ())
-</MACRO>
-<MACRO>
-<NAME>GIMP_PIXMAP</NAME>
-#define GIMP_PIXMAP(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PIXMAP, GimpPixmap))
-</MACRO>
-<MACRO>
-<NAME>GIMP_PIXMAP_CLASS</NAME>
-#define GIMP_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIXMAP, GimpPixmapClass))
-</MACRO>
-<MACRO>
-<NAME>GIMP_IS_PIXMAP</NAME>
-#define GIMP_IS_PIXMAP(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PIXMAP))
-</MACRO>
-<MACRO>
-<NAME>GIMP_IS_PIXMAP_CLASS</NAME>
-#define GIMP_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PIXMAP))
-</MACRO>
-<STRUCT>
-<NAME>GimpPixmap</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpPixmapClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpPixmapClass</NAME>
-struct GimpPixmapClass
-{
-  GtkPixmapClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_pixmap_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixmap_new</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar      **xpm_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixmap_set</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixmap  *pixmap,gchar      **xpm_data
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpHelpFunc</NAME>
-<RETURNS>void </RETURNS>
-gchar *help_data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_init</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_free</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_enable_tooltips</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_disable_tooltips</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_standard_help_func</NAME>
-<RETURNS>void  </RETURNS>
-gchar        *help_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_connect_help_accel</NAME>
-<RETURNS>void  </RETURNS>
-GtkWidget    *widget,GimpHelpFunc  help_func,gchar        *help_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help_set_help_data</NAME>
-<RETURNS>void  </RETURNS>
-GtkWidget    *widget,const gchar  *tooltip,gchar        *help_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_context_help</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<STRUCT>
-<NAME>GimpPlugInInfo</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpTile</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpDrawable</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpPixelRgn</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpParamDef</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpParamColor</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpParamRegion</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpParam</NAME>
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_dialog_new</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-const gchar        *title,const gchar        *wmclass_name,GimpHelpFunc        help_func,gchar              *help_data,GtkWindowPosition   position,gint                allow_shrink,gint                allow_grow,gint                auto_shrink,...
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dialog_newv</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-const gchar        *title,const gchar        *wmclass_name,GimpHelpFunc        help_func,gchar              *help_data,GtkWindowPosition   position,gint                allow_shrink,gint                allow_grow,gint                auto_shrink,va_list             args
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dialog_set_icon</NAME>
-<RETURNS>void  </RETURNS>
-GtkWindow          *dialog
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dialog_create_action_area</NAME>
-<RETURNS>void  </RETURNS>
-GtkDialog          *dialog,...
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dialog_create_action_areav</NAME>
-<RETURNS>void  </RETURNS>
-GtkDialog          *dialog,va_list             args
+gint         sx,gint         sy,gint         w,gint         h,gdouble     *x,gdouble     *y,GimpVector3 *vp,GimpVector3 *p
 </FUNCTION>
 <FUNCTION>
 <NAME>gimp_option_menu_new</NAME>
@@ -3117,2984 +5046,213 @@ GtkWidget       *widget,gpointer         data
 <RETURNS>void  </RETURNS>
 GtkTable           *table,gint                column,gint                row,gchar              *label_text,gfloat              xalign,gfloat              yalign,GtkWidget          *widget,gint                colspan,gboolean            left_align
 </FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_copy</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_name</NAME>
-<RETURNS>gchar *</RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_name</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gchar    *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gboolean  visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_show_masked</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_show_masked</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gboolean  show_masked
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_opacity</NAME>
-<RETURNS>gdouble  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_opacity</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gdouble   opacity
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_color</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,guchar   *red,guchar   *green,guchar   *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_color</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,guchar    red,guchar    green,guchar    blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_tattoo</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_tattoo</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gint      tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_find</NAME>
-<RETURNS>GimpParasite *</RETURNS>
-gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_list</NAME>
-<RETURNS>void  </RETURNS>
-gint         *num_parasites,gchar**       parasites
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_find</NAME>
-<RETURNS>GimpParasite *</RETURNS>
-gint32        drawable_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_list</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gint         *num_parasites,gchar**       parasites
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_find</NAME>
-<RETURNS>GimpParasite *</RETURNS>
-gint32        image_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        image_ID,GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        image_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_list</NAME>
-<RETURNS>void  </RETURNS>
-gint32        image_ID,gint         *num_parasites,gchar**       parasites
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpQueryStringCallback</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *query_box,
-					   gchar     *string,
-					   gpointer   data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpQueryIntCallback</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *query_box,
-					   gint       value,
-					   gpointer   data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpQueryDoubleCallback</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *query_box,
-					   gdouble    value,
-					   gpointer   data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpQuerySizeCallback</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *query_box,
-					   gdouble    size,
-					   GimpUnit   unit,
-					   gpointer   data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpQueryBooleanCallback</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *query_box,
-					   gboolean   value,
-					   gpointer   data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>gimp_query_string_box</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gchar                    *initial,GtkObject                *object,gchar                    *signal,GimpQueryStringCallback   callback,gpointer                  data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_query_int_box</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,char                     *message,gint                      initial,gint                      lower,gint                      upper,GtkObject                *object,gchar                    *signal,GimpQueryIntCallback      callback,gpointer                  data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_query_double_box</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gdouble                   initial,gdouble                   lower,gdouble                   upper,gint                      digits,GtkObject                *object,gchar                    *signal,GimpQueryDoubleCallback   callback,gpointer                  data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_query_size_box</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gchar                    *message,gdouble                   initial,gdouble                   lower,gdouble                   upper,gint                      digits,GimpUnit                  unit,gdouble                   resolution,gboolean                  dot_for_dot,GtkObject                *object,gchar                    *signal,GimpQuerySizeCallback     callback,gpointer                  data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_query_boolean_box</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-gchar                    *title,GimpHelpFunc              help_func,gchar                    *help_data,gboolean                  eek,gchar                    *message,gchar                    *true_button,gchar                    *false_button,GtkObject                *object,gchar                    *signal,GimpQueryBooleanCallback  callback,gpointer                  data
-</FUNCTION>
-<MACRO>
-<NAME>gimp_strescape</NAME>
-#define gimp_strescape(string, exceptions) g_strescape (string, exceptions)
-</MACRO>
-<FUNCTION>
-<NAME>gimp_strescape</NAME>
-<RETURNS>gchar *</RETURNS>
-const gchar *source,const gchar *exceptions
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_display_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_display_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32 display_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_displays_flush</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
 <STRUCT>
-<NAME>GimpVector2</NAME>
+<NAME>WireMessage</NAME>
 </STRUCT>
+<USER_FUNCTION>
+<NAME>WireReadFunc</NAME>
+<RETURNS>void </RETURNS>
+GIOChannel  *channel,
+				      WireMessage *msg
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>WireWriteFunc</NAME>
+<RETURNS>void </RETURNS>
+GIOChannel  *channel,
+				      WireMessage *msg
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>WireDestroyFunc</NAME>
+<RETURNS>void </RETURNS>
+WireMessage *msg
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>WireIOFunc</NAME>
+<RETURNS>gboolean </RETURNS>
+GIOChannel  *channel,
+				      guint8      *buf,
+				      gulong       count
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>WireFlushFunc</NAME>
+<RETURNS>gboolean </RETURNS>
+GIOChannel  *channel
+</USER_FUNCTION>
 <STRUCT>
-<NAME>GimpVector3</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpVector4</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpVector2</NAME>
-struct GimpVector2
+<NAME>WireMessage</NAME>
+struct WireMessage
 {
-  gdouble x, y;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GimpVector3</NAME>
-struct GimpVector3
-{
-  gdouble x, y, z;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GimpVector4</NAME>
-struct GimpVector4
-{
-  gdouble x, y, z, w;
+  guint32  type;
+  gpointer data;
 };
 </STRUCT>
 <FUNCTION>
-<NAME>gimp_vector2_inner_product</NAME>
-<RETURNS>gdouble  </RETURNS>
-GimpVector2 *vector1,GimpVector2 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector2_cross_product</NAME>
-<RETURNS>GimpVector2  </RETURNS>
-GimpVector2 *vector1,GimpVector2 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector2_length</NAME>
-<RETURNS>gdouble  </RETURNS>
-GimpVector2 *vector
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector2_normalize</NAME>
+<NAME>wire_register</NAME>
 <RETURNS>void  </RETURNS>
-GimpVector2 *vector
+guint32          type,WireReadFunc     read_func,WireWriteFunc    write_func,WireDestroyFunc  destroy_func
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_vector2_mul</NAME>
+<NAME>wire_set_reader</NAME>
 <RETURNS>void  </RETURNS>
-GimpVector2 *vector,gdouble      factor
+WireIOFunc       read_func
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_vector2_sub</NAME>
+<NAME>wire_set_writer</NAME>
 <RETURNS>void  </RETURNS>
-GimpVector2 *result,GimpVector2 *vector1,GimpVector2 *vector2
+WireIOFunc       write_func
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_vector2_set</NAME>
+<NAME>wire_set_flusher</NAME>
 <RETURNS>void  </RETURNS>
-GimpVector2 *vector,gdouble      x,gdouble      y
+WireFlushFunc    flush_func
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_vector2_add</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector2 *result,GimpVector2 *vector1,GimpVector2 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector2_neg</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector2 *vector
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector2_rotate</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector2 *vector,gdouble      alpha
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_inner_product</NAME>
-<RETURNS>gdouble  </RETURNS>
-GimpVector3 *vector1,GimpVector3 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_cross_product</NAME>
-<RETURNS>GimpVector3  </RETURNS>
-GimpVector3 *vector1,GimpVector3 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_length</NAME>
-<RETURNS>gdouble  </RETURNS>
-GimpVector3 *vector
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_normalize</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *vector
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_mul</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *vector,gdouble      factor
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_sub</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *result,GimpVector3 *vector1,GimpVector3 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_set</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *vector,gdouble      x,gdouble      y,gdouble      z
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_add</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *result,GimpVector3 *vector1,GimpVector3 *vector2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_neg</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *vector
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector3_rotate</NAME>
-<RETURNS>void  </RETURNS>
-GimpVector3 *vector,gdouble      alpha,gdouble      beta,gdouble      gamma
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector_2d_to_3d</NAME>
-<RETURNS>void  </RETURNS>
-gint         sx,gint         sy,gint         w,gint         h,gint         x,gint         y,GimpVector3 *vp,GimpVector3 *p
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_vector_3d_to_2d</NAME>
-<RETURNS>void  </RETURNS>
-gint         sx,gint         sy,gint         w,gint         h,gdouble     *x,gdouble     *y,GimpVector3 *vp,GimpVector3 *p
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help</NAME>
-<RETURNS>void  </RETURNS>
-gchar *prog_name,gchar *help_page
-</FUNCTION>
-<MACRO>
-<NAME>SA_RESTART</NAME>
-#define SA_RESTART SA_SYSV
-</MACRO>
-<USER_FUNCTION>
-<NAME>GimpSignalHandlerFunc</NAME>
-<RETURNS>void </RETURNS>
-gint signum
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>gimp_signal_private</NAME>
-<RETURNS>GimpSignalHandlerFunc  </RETURNS>
-gint                   signum,GimpSignalHandlerFunc  handler,gint                   flags
-</FUNCTION>
-<MACRO>
-<NAME>gimp_signal_syscallrestart</NAME>
-#define gimp_signal_syscallrestart(signum,handler) gimp_signal_private ((signum), (handler), SA_RESTART)
-</MACRO>
-<FUNCTION>
-<NAME>gimp_image_list</NAME>
-<RETURNS>gint *</RETURNS>
-gint               *num_images
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint                width,gint                height,GimpImageBaseType   type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_resize</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint                new_width,gint                new_height,gint                offx,gint                offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_scale</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint                new_width,gint                new_height
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_free_shadow</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_layers</NAME>
-<RETURNS>gint *</RETURNS>
-gint32              image_ID,gint               *num_layers
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_channels</NAME>
-<RETURNS>gint *</RETURNS>
-gint32              image_ID,gint               *num_channels
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_unset_active_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_pick_correlate_layer</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID,gint                x,gint                y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_raise_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_lower_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_raise_layer_to_top</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_lower_layer_to_bottom</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_merge_visible_layers</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID,GimpMergeType       merge_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_merge_down</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID,gint32              merge_layer_ID,GimpMergeType       merge_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_flatten</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID,gint                position
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_layer_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID,gint32              mask_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_layer_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID,GimpMaskApplyMode   mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_raise_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_lower_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              channel_ID,gint                position
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_active_drawable</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_base_type</NAME>
-<RETURNS>GimpImageBaseType  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_is_enabled</NAME>
+<NAME>wire_read</NAME>
 <RETURNS>gboolean  </RETURNS>
-gint32              image_ID
+GIOChannel	     *channel,guint8          *buf,gulong           count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_image_undo_enable</NAME>
+<NAME>wire_write</NAME>
 <RETURNS>gboolean  </RETURNS>
-gint32              image_ID
+GIOChannel      *channel,guint8          *buf,gulong           count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_image_undo_disable</NAME>
+<NAME>wire_flush</NAME>
 <RETURNS>gboolean  </RETURNS>
-gint32              image_ID
+GIOChannel	     *channel
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_image_undo_freeze</NAME>
+<NAME>wire_error</NAME>
 <RETURNS>gboolean  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_thaw</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_clean_all</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_floating_selection</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_floating_sel_attached_to</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_tattoo_state</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint                tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_tattoo_state</NAME>
-<RETURNS>gint  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_width</NAME>
-<RETURNS>gint  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_height</NAME>
-<RETURNS>gint  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_active_layer</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_active_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              active_layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_active_channel</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_active_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gint32              active_channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_selection</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_component_active</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32              image_ID,GimpChannelType     component
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_component_active</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,GimpChannelType     component,gboolean            active
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_component_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32              image_ID,GimpChannelType     component
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_component_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,GimpChannelType     component,gboolean            visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_filename</NAME>
-<RETURNS>gchar *</RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_filename</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gchar              *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_resolution</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gdouble            *xresolution,gdouble            *yresolution
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_resolution</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,gdouble             xresolution,gdouble             yresolution
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_unit</NAME>
-<RETURNS>GimpUnit  </RETURNS>
-gint32              image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_unit</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,GimpUnit            unit
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_layer_by_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID,gint                tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_channel_by_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32              image_ID,gint                tattoo
-</FUNCTION>
-<MACRO>
-<NAME>GIMP_PARASITE_PERSISTENT</NAME>
-#define GIMP_PARASITE_PERSISTENT 1
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_UNDOABLE</NAME>
-#define GIMP_PARASITE_UNDOABLE   2
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_ATTACH_PARENT</NAME>
-#define GIMP_PARASITE_ATTACH_PARENT     (0x80 << 8)
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_PARENT_PERSISTENT</NAME>
-#define GIMP_PARASITE_PARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 8)
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_PARENT_UNDOABLE</NAME>
-#define GIMP_PARASITE_PARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 8)
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_ATTACH_GRANDPARENT</NAME>
-#define GIMP_PARASITE_ATTACH_GRANDPARENT     (0x80 << 16)
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_GRANDPARENT_PERSISTENT</NAME>
-#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
-</MACRO>
-<MACRO>
-<NAME>GIMP_PARASITE_GRANDPARENT_UNDOABLE</NAME>
-#define GIMP_PARASITE_GRANDPARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 16)
-</MACRO>
-<STRUCT>
-<NAME>GimpParasite</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpParasite</NAME>
-struct GimpParasite
-{
-  gchar    *name;   /* The name of the parasite. USE A UNIQUE PREFIX! */
-  guint32   flags;  /* save Parasite in XCF file, etc.                */
-  guint32   size;   /* amount of data                                 */
-  gpointer  data;   /* a pointer to the data.  plugin is              *
-		     * responsible for tracking byte order            */
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_parasite_new</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-const gchar        *name,guint32             flags,guint32             size,const gpointer      data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_free</NAME>
-<RETURNS>void  </RETURNS>
-GimpParasite       *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_copy</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_compare</NAME>
-<RETURNS>gboolean  </RETURNS>
-const GimpParasite *a,const GimpParasite *b
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_is_type</NAME>
-<RETURNS>gboolean  </RETURNS>
-const GimpParasite *parasite,const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_is_persistent</NAME>
-<RETURNS>gboolean  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_is_undoable</NAME>
-<RETURNS>gboolean  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_has_flag</NAME>
-<RETURNS>gboolean  </RETURNS>
-const GimpParasite *parasite,gulong              flag
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_flags</NAME>
-<RETURNS>gulong  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_name</NAME>
-<RETURNS>const gchar   *</RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_data</NAME>
-<RETURNS>gpointer  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_data_size</NAME>
-<RETURNS>glong  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_attach_new_parasite</NAME>
-<RETURNS>void  </RETURNS>
-const gchar        *name,gint                flags,gint                size,const gpointer      data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_attach_new_parasite</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,const gchar        *name,gint                flags,gint                size,const gpointer      data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_attach_new_parasite</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,const gchar        *name,gint                flags,gint                size,const gpointer      data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_merge_shadow</NAME>
-<RETURNS>void  </RETURNS>
-gint32         drawable_ID,gboolean       undo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_fill</NAME>
-<RETURNS>void  </RETURNS>
-gint32         drawable_ID,GimpFillType   fill_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_update</NAME>
-<RETURNS>void  </RETURNS>
-gint32         drawable_ID,gint           x,gint           y,gint           width,gint           height
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_mask_bounds</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID,gint          *x1,gint          *y1,gint          *x2,gint          *y2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_image</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_type</NAME>
-<RETURNS>GimpImageType  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_has_alpha</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_type_with_alpha</NAME>
-<RETURNS>GimpImageType  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_rgb</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_gray</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_indexed</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_bytes</NAME>
-<RETURNS>gint  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_width</NAME>
-<RETURNS>gint  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_height</NAME>
-<RETURNS>gint  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_offsets</NAME>
-<RETURNS>void  </RETURNS>
-gint32         drawable_ID,gint          *offset_x,gint          *offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_layer</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_layer_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_channel</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         drawable_ID
-</FUNCTION>
-<MACRO>
-<NAME>GIMP_PIXPIPE_MAXDIM</NAME>
-#define GIMP_PIXPIPE_MAXDIM 4
-</MACRO>
-<FUNCTION>
-<NAME>gimp_pixpipe_params_init</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixPipeParams *params
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixpipe_params_parse</NAME>
-<RETURNS>void  </RETURNS>
-gchar             *parameters,GimpPixPipeParams *params
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixpipe_params_build</NAME>
-<RETURNS>gchar  *</RETURNS>
-GimpPixPipeParams *params
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayInit</NAME>
-<RETURNS>void </RETURNS>
 void
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayNew</NAME>
-<RETURNS>gpointer </RETURNS>
-gint          type
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayClone</NAME>
-<RETURNS>gpointer </RETURNS>
-gpointer      cd_ID
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayConvert</NAME>
-<RETURNS>void </RETURNS>
-gpointer      cd_ID,
-						      guchar       *buf,
-						      gint          width,
-						      gint          height,
-						      gint          bpp,
-						      gint          bpl
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayDestroy</NAME>
-<RETURNS>void </RETURNS>
-gpointer      cd_ID
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayFinalize</NAME>
-<RETURNS>void </RETURNS>
-void
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayLoadState</NAME>
-<RETURNS>void </RETURNS>
-gpointer      cd_ID,
-						      GimpParasite *state
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplaySaveState</NAME>
-<RETURNS>GimpParasite *</RETURNS>
-gpointer      cd_ID
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayConfigure</NAME>
-<RETURNS>void </RETURNS>
-gpointer      cd_ID,
-						      GFunc         ok_func,
-						      gpointer      ok_data,
-						      GFunc         cancel_func,
-						      gpointer      cancel_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorDisplayConfigureCancel</NAME>
-<RETURNS>void </RETURNS>
-gpointer      cd_ID
-</USER_FUNCTION>
-<STRUCT>
-<NAME>GimpColorDisplayMethods</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpColorDisplayMethods</NAME>
-struct GimpColorDisplayMethods
-{
-  GimpColorDisplayInit            init;
-  GimpColorDisplayNew             new;
-  GimpColorDisplayClone           clone;
-  GimpColorDisplayConvert         convert;
-  GimpColorDisplayDestroy         destroy;
-  GimpColorDisplayFinalize        finalize;
-  GimpColorDisplayLoadState       load;
-  GimpColorDisplaySaveState       save;
-  GimpColorDisplayConfigure       configure;
-  GimpColorDisplayConfigureCancel cancel;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_color_display_register</NAME>
-<RETURNS>gboolean  </RETURNS>
-const gchar             *name,GimpColorDisplayMethods *methods
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_color_display_unregister</NAME>
-<RETURNS>gboolean  </RETURNS>
-const gchar             *name
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorSelector_Callback</NAME>
-<RETURNS>void </RETURNS>
-gpointer   data,
-						    gint       r,
-						    gint       g,
-						    gint       b
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorSelector_NewFunc</NAME>
-<RETURNS>GtkWidget *</RETURNS>
-gint       r,
-						    gint       g,
-						    gint       b,
-						    GimpColorSelector_Callback cb,
-						    gpointer   data,
-						    gpointer  *selector_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorSelector_FreeFunc</NAME>
-<RETURNS>void </RETURNS>
-gpointer   selector_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorSelector_SetColorFunc</NAME>
-<RETURNS>void </RETURNS>
-gpointer   selector_data,
-						    gint       r,
-						    gint       g,
-						    gint       b,
-						    gboolean   set_current
-</USER_FUNCTION>
-<STRUCT>
-<NAME>GimpColorSelectorMethods</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GimpColorSelectorMethods</NAME>
-struct GimpColorSelectorMethods
-{
-  GimpColorSelector_NewFunc      new;
-  GimpColorSelector_FreeFunc     free;
-  GimpColorSelector_SetColorFunc setcolor;
-};
-</STRUCT>
-<TYPEDEF>
-<NAME>GimpColorSelectorID</NAME>
-typedef gpointer GimpColorSelectorID;
-</TYPEDEF>
-<FUNCTION>
-<NAME>gimp_color_selector_register</NAME>
-<RETURNS>GimpColorSelectorID  </RETURNS>
-const gchar *name,const gchar *help_page,GimpColorSelectorMethods *methods
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>GimpColorSelectorFinishedCB</NAME>
-<RETURNS>void </RETURNS>
-gpointer           finished_data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_selector_unregister</NAME>
-<RETURNS>gboolean  </RETURNS>
-GimpColorSelectorID  id,GimpColorSelectorFinishedCB  finished_cb,gpointer             finished_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_create_mask</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                layer_ID,GimpAddMaskType       mask_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_scale</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gint                  new_width,gint                  new_height,gboolean              local_origin
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_resize</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gint                  new_width,gint                  new_height,gint                  offx,gint                  offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_translate</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gint                  offx,gint                  offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_add_alpha</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_offsets</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gint                  offx,gint                  offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_mask</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_is_floating_sel</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_name</NAME>
-<RETURNS>gchar *</RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_name</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gchar                *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_preserve_trans</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_preserve_trans</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              preserve_trans
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_apply_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_apply_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              apply_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_show_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_show_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              show_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_edit_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_edit_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              edit_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_opacity</NAME>
-<RETURNS>gdouble  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_opacity</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gdouble               opacity
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_mode</NAME>
-<RETURNS>GimpLayerModeEffects  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_mode</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,GimpLayerModeEffects  mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_linked</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_linked</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gboolean              linked
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_tattoo</NAME>
-<RETURNS>gint  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_tattoo</NAME>
-<RETURNS>void  </RETURNS>
-gint32                layer_ID,gint                  tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_get_foreground</NAME>
-<RETURNS>void  </RETURNS>
-guchar *red,guchar *green,guchar *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_get_background</NAME>
-<RETURNS>void  </RETURNS>
-guchar *red,guchar *green,guchar *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_set_foreground</NAME>
-<RETURNS>void  </RETURNS>
-guchar  red,guchar  green,guchar  blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_set_background</NAME>
-<RETURNS>void  </RETURNS>
-guchar  red,guchar  green,guchar  blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_set_default_colors</NAME>
+<NAME>wire_clear_error</NAME>
 <RETURNS>void  </RETURNS>
 void
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_palette_swap_colors</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_refresh</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_bounds</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gboolean *non_empty,gint     *x1,gint     *y1,gint     *x2,gint     *y2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_is_empty</NAME>
+<NAME>wire_read_msg</NAME>
 <RETURNS>gboolean  </RETURNS>
-gint32    image_ID
+GIOChannel	     *channel,WireMessage     *msg
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_selection_none</NAME>
+<NAME>wire_write_msg</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel	     *channel,WireMessage     *msg
+</FUNCTION>
+<FUNCTION>
+<NAME>wire_destroy</NAME>
 <RETURNS>void  </RETURNS>
-gint32    image_ID
-</FUNCTION>
-<STRUCT>
-<NAME>GimpPixelRgn</NAME>
-struct GimpPixelRgn
-{
-  guchar       *data;          /* pointer to region data */
-  GimpDrawable *drawable;      /* pointer to drawable */
-  guint         bpp;           /* bytes per pixel */
-  guint         rowstride;     /* bytes per pixel row */
-  guint         x, y;          /* origin */
-  guint         w, h;          /* width and height of region */
-  guint         dirty : 1;     /* will this region be dirtied? */
-  guint         shadow : 1;    /* will this region use the shadow or normal tiles */
-  guint         process_count; /* used internally */
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_pixel_rgn_init</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,GimpDrawable  *drawable,gint           x,gint           y,gint           width,gint           height,gint           dirty,gint           shadow
+WireMessage     *msg
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_resize</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,gint           x,gint           y,gint           width,gint           height
+<NAME>wire_read_int32</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,guint32         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_get_pixel</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y
+<NAME>wire_read_int16</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel	     *channel,guint16         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_get_row</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width
+<NAME>wire_read_int8</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,guint8          *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_get_col</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           height
+<NAME>wire_read_double</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,gdouble         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_get_rect</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width,gint           height
+<NAME>wire_read_string</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,gchar          **data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_set_pixel</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y
+<NAME>wire_write_int32</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,guint32         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_set_row</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width
+<NAME>wire_write_int16</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,guint16         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_set_col</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           height
+<NAME>wire_write_int8</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,guint8          *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgn_set_rect</NAME>
-<RETURNS>void  </RETURNS>
-GimpPixelRgn  *pr,guchar        *buf,gint           x,gint           y,gint           width,gint           height
+<NAME>wire_write_double</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,gdouble         *data,gint             count
 </FUNCTION>
 <FUNCTION>
-<NAME>gimp_pixel_rgns_register</NAME>
-<RETURNS>gpointer  </RETURNS>
-gint           nrgns,...
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixel_rgns_register2</NAME>
-<RETURNS>gpointer  </RETURNS>
-gint           nrgns,GimpPixelRgn **prs
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pixel_rgns_process</NAME>
-<RETURNS>gpointer  </RETURNS>
-gpointer       pri_ptr
+<NAME>wire_write_string</NAME>
+<RETURNS>gboolean  </RETURNS>
+GIOChannel      *channel,gchar          **data,gint             count
 </FUNCTION>
 <MACRO>
-<NAME>gimp_drawable_offset</NAME>
-#define gimp_drawable_offset    gimp_channel_ops_offset
+<NAME>GIMP_MAJOR_VERSION</NAME>
+#define GIMP_MAJOR_VERSION				(1)
 </MACRO>
 <MACRO>
-<NAME>gimp_drawable_image_id</NAME>
-#define gimp_drawable_image_id  gimp_drawable_image
+<NAME>GIMP_MINOR_VERSION</NAME>
+#define GIMP_MINOR_VERSION				(1)
 </MACRO>
 <MACRO>
-<NAME>gimp_drawable_bpp</NAME>
-#define gimp_drawable_bpp       gimp_drawable_bytes
-</MACRO>
-<STRUCT>
-<NAME>GimpDrawable</NAME>
-struct GimpDrawable
-{
-  gint32    id;            /* drawable ID */
-  guint     width;         /* width of drawble */
-  guint     height;        /* height of drawble */
-  guint     bpp;           /* bytes per pixel of drawable */
-  guint     ntile_rows;    /* # of tile rows */
-  guint     ntile_cols;    /* # of tile columns */
-  GimpTile *tiles;         /* the normal tiles */
-  GimpTile *shadow_tiles;  /* the shadow tiles */
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gimp_drawable_get</NAME>
-<RETURNS>GimpDrawable  *</RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_detach</NAME>
-<RETURNS>void  </RETURNS>
-GimpDrawable *drawable
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_flush</NAME>
-<RETURNS>void  </RETURNS>
-GimpDrawable *drawable
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_delete</NAME>
-<RETURNS>void  </RETURNS>
-GimpDrawable *drawable
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_name</NAME>
-<RETURNS>gchar         *</RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_set_name</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gboolean      visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_get_tile</NAME>
-<RETURNS>GimpTile      *</RETURNS>
-GimpDrawable *drawable,gint          shadow,gint          row,gint          col
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_get_tile2</NAME>
-<RETURNS>GimpTile      *</RETURNS>
-GimpDrawable *drawable,gint          shadow,gint          x,gint          y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_get_thumbnail_data</NAME>
-<RETURNS>guchar        *</RETURNS>
-gint32        drawable_ID,gint         *width,gint         *height,gint         *bpp
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_progress_init</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *message
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_progress_update</NAME>
-<RETURNS>void  </RETURNS>
-gdouble  percentage
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_temp_PDB_name</NAME>
-<RETURNS>gchar *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_plugin_domain_register</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *domain_name,gchar   *domain_path
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_plugin_help_register</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *help_path
-</FUNCTION>
-<MACRO>
-<NAME>gimp_layer_get_mask_id</NAME>
-#define gimp_layer_get_mask_id               gimp_layer_mask
+<NAME>GIMP_MICRO_VERSION</NAME>
+#define GIMP_MICRO_VERSION				(25)
 </MACRO>
 <MACRO>
-<NAME>gimp_layer_get_image_id</NAME>
-#define gimp_layer_get_image_id              gimp_drawable_image
+<NAME>GIMP_VERSION</NAME>
+#define GIMP_VERSION					"1.1.25"
 </MACRO>
 <MACRO>
-<NAME>gimp_layer_is_floating_selection</NAME>
-#define gimp_layer_is_floating_selection     gimp_layer_is_floating_sel
+<NAME>GIMP_CHECK_VERSION</NAME>
+#define GIMP_CHECK_VERSION(major, minor, micro)	\
+    (GIMP_MAJOR_VERSION > (major) || \
+     (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION > (minor)) || \
+     (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION == (minor) && \
+      GIMP_MICRO_VERSION >= (micro)))
 </MACRO>
 <MACRO>
-<NAME>gimp_layer_get_preserve_transparency</NAME>
-#define gimp_layer_get_preserve_transparency gimp_layer_get_preserve_trans
+<NAME>GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE</NAME>
+#define GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE		1-1-0
 </MACRO>
 <MACRO>
-<NAME>gimp_layer_set_preserve_transparency</NAME>
-#define gimp_layer_set_preserve_transparency gimp_layer_set_preserve_trans
-</MACRO>
-<FUNCTION>
-<NAME>gimp_layer_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                image_ID,gchar                *name,gint                  width,gint                  height,GimpImageType         type,gdouble               opacity,GimpLayerModeEffects  mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_copy</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_magic_load_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *procedure_name,gchar *extensions,gchar *prefixes,gchar *magics
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_load_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *procedure_name,gchar *extensions,gchar *prefixes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_save_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *procedure_name,gchar *extensions,gchar *prefixes
-</FUNCTION>
-<MACRO>
-<NAME>gimp_image_convert_rgb</NAME>
-#define gimp_image_convert_rgb        gimp_convert_rgb
+<NAME>GIMP_HAVE_PARASITES</NAME>
+#define GIMP_HAVE_PARASITES				1-1-0
 </MACRO>
 <MACRO>
-<NAME>gimp_image_convert_grayscale</NAME>
-#define gimp_image_convert_grayscale  gimp_convert_grayscale
+<NAME>GIMP_HAVE_RESOLUTION_INFO</NAME>
+#define GIMP_HAVE_RESOLUTION_INFO			1-1-0
 </MACRO>
 <MACRO>
-<NAME>gimp_image_convert_indexed</NAME>
-#define gimp_image_convert_indexed    gimp_convert_indexed
+<NAME>GIMP_HAVE_DESTROY_PARAMDEFS</NAME>
+#define GIMP_HAVE_DESTROY_PARAMDEFS			1-1-0
 </MACRO>
 <MACRO>
-<NAME>gimp_image_duplicate</NAME>
-#define gimp_image_duplicate          gimp_channel_ops_duplicate
+<NAME>GIMP_HAVE_FEATURES_1_1_5</NAME>
+#define GIMP_HAVE_FEATURES_1_1_5			1-1-5
 </MACRO>
-<FUNCTION>
-<NAME>gimp_image_get_cmap</NAME>
-<RETURNS>guchar  *</RETURNS>
-gint32  image_ID,gint   *num_colors
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_cmap</NAME>
-<RETURNS>void  </RETURNS>
-gint32  image_ID,guchar *cmap,gint    num_colors
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_thumbnail_data</NAME>
-<RETURNS>guchar  *</RETURNS>
-gint32  image_ID,gint   *width,gint   *height,gint   *bpp
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_dump</NAME>
-<RETURNS>void  </RETURNS>
-gchar            *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_query</NAME>
-<RETURNS>void  </RETURNS>
-gchar            *name,gchar            *blurb,gchar            *help,gchar            *author,gchar            *copyright,gchar            *date,gchar            *proc_type,gint             *num_matches,gchar          ***proc_names
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_arg</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar            *procedure,gint              arg_num,GimpPDBArgType   *arg_type,gchar           **arg_name,gchar           **arg_desc
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_val</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar            *procedure,gint              val_num,GimpPDBArgType   *val_type,gchar           **val_name,gchar           **val_desc
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_get_data_size</NAME>
-<RETURNS>gint  </RETURNS>
-gchar            *identifier
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_message</NAME>
-<RETURNS>void  </RETURNS>
-gchar                  *message
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_message_get_handler</NAME>
-<RETURNS>GimpMessageHandlerType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_message_set_handler</NAME>
-<RETURNS>void  </RETURNS>
-GimpMessageHandlerType  handler
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_hguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID,gint   yposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_vguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID,gint   xposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_delete_guide</NAME>
-<RETURNS>void  </RETURNS>
-gint32 image_ID,gint32 guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_find_next_guide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID,gint32 guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_orientation</NAME>
-<RETURNS>GimpOrientationType  </RETURNS>
-gint32 image_ID,gint32 guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_position</NAME>
-<RETURNS>gint  </RETURNS>
-gint32 image_ID,gint32 guide_ID
-</FUNCTION>
 <MACRO>
-<NAME>gimp_channel_get_image_id</NAME>
-#define gimp_channel_get_image_id  gimp_drawable_image
+<NAME>GIMP_HAVE_DEFAULT_DISPLAY</NAME>
+#define GIMP_HAVE_DEFAULT_DISPLAY			1-1-5
+</MACRO>
+<MACRO>
+<NAME>GIMP_HAVE_PIXEL_RGNS_REGISTER2</NAME>
+#define GIMP_HAVE_PIXEL_RGNS_REGISTER2			1-1-5
+</MACRO>
+<MACRO>
+<NAME>GIMP_HAVE_NEW_ENUMS</NAME>
+#define GIMP_HAVE_NEW_ENUMS				1-1-10
+</MACRO>
+<MACRO>
+<NAME>GIMP_HAVE_EXPORT</NAME>
+#define GIMP_HAVE_EXPORT                                1-1-10
 </MACRO>
-<FUNCTION>
-<NAME>gimp_channel_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32    image_ID,gchar    *name,guint     width,guint     height,gdouble   opacity,guchar   *color
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_info</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar            *procedure,gchar           **blurb,gchar           **help,gchar           **author,gchar           **copyright,gchar           **date,GimpPDBProcType  *proc_type,gint             *num_args,gint             *num_values,GimpParamDef    **params,GimpParamDef    **return_vals
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_get_data</NAME>
-<RETURNS>void  </RETURNS>
-gchar            *identifier,gpointer          data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_set_data</NAME>
-<RETURNS>void  </RETURNS>
-gchar            *identifier,gpointer          data,guint32           length
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_brushes_get_brush_data</NAME>
-<RETURNS>gchar *</RETURNS>
-gchar                 *brush_name,gdouble               *opacity,gint                  *spacing,GimpLayerModeEffects  *paint_mode,gint                  *width,gint                  *height,gint                  *mask_data_size,guint8               **mask_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_brushes_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar                *brush_callback,gchar                *popup_title,gchar                *initial_brush,gdouble               opacity,gint                  spacing,GimpLayerModeEffects  paint_mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_brushes_close_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar                *brush_callback
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_brushes_set_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar                *brush_callback,gchar                *brush_name,gdouble               opacity,gint                  spacing,GimpLayerModeEffects  paint_mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_convert_rgb</NAME>
-<RETURNS>void  </RETURNS>
-gint32                  image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_convert_grayscale</NAME>
-<RETURNS>void  </RETURNS>
-gint32                  image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_convert_indexed</NAME>
-<RETURNS>void  </RETURNS>
-gint32                  image_ID,GimpConvertDitherType   dither_type,GimpConvertPaletteType  palette_type,gint                    num_cols,gboolean                alpha_dither,gboolean                remove_unused,gchar                  *palette
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gimprc_query</NAME>
-<RETURNS>gchar *</RETURNS>
-gchar   *token
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gimprc_set</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *token,gchar   *value
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_get_monitor_resolution</NAME>
-<RETURNS>void  </RETURNS>
-gdouble *xres,gdouble *yres
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *gradients_callback,gchar    *popup_title,gchar    *initial_gradient,gint      sample_size
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_close_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *gradients_callback
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_set_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *gradients_callback,gchar    *gradient_name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_patterns_get_pattern_data</NAME>
-<RETURNS>gchar *</RETURNS>
-gchar   *name,gint    *width,gint    *height,gint    *mask_bpp,gint    *mask_data_size,guint8 **mask_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_text_fontname</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        image_ID,gint32        drawable_ID,gdouble       x,gdouble       y,gchar        *text,gint          border,gboolean      antialias,gdouble       size,GimpSizeType  size_type,gchar        *fontname
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_text_get_extents_fontname</NAME>
-<RETURNS>void  </RETURNS>
-gchar        *text,gdouble       size,GimpSizeType  size_type,gchar        *fontname,gint         *width,gint         *height,gint         *ascent,gint         *descent
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_text</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        image_ID,gint32        drawable_ID,gdouble       x,gdouble       y,gchar        *text,gint          border,gboolean      antialias,gdouble       size,GimpSizeType  size_type,gchar        *foundry,gchar        *family,gchar        *weight,gchar        *slant,gchar        *set_width,gchar        *spacing,gchar        *registry,gchar        *encoding
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_text_get_extents</NAME>
-<RETURNS>void  </RETURNS>
-gchar        *text,gdouble       size,GimpSizeType  size_type,gchar        *foundry,gchar        *family,gchar        *weight,gchar        *slant,gchar        *set_width,gchar        *spacing,gchar        *registry,gchar        *encoding,gint         *width,gint         *height,gint         *ascent,gint         *descent
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_patterns_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar *pattern_callback,gchar *popup_title,gchar *initial_pattern
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_patterns_close_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar *pattern_callback
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_patterns_set_popup</NAME>
-<RETURNS>void  </RETURNS>
-gchar *pattern_callback,gchar *pattern_name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_airbrush</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   pressure,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_airbrush_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_blend</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,GimpBlendMode             blend_mode,GimpLayerModeEffects      paint_mode,GimpGradientType          gradient_type,gdouble                   opacity,gdouble                   offset,GimpRepeatMode            repeat,gboolean                  supersample,gint                      max_depth,gdouble                   threshold,gdouble                   x1,gdouble                   y1,gdouble                   x2,gdouble                   y2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_bucket_fill</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,GimpBucketFillMode        fill_mode,GimpLayerModeEffects      paint_mode,gdouble                   opacity,gdouble                   threshold,gboolean                  sample_merged,gdouble                   x,gdouble                   y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_by_color_select</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,guchar                    red,guchar                    green,guchar                    blue,gint                      threshold,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius,gboolean                  sample_merged
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_clone</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint32                    src_drawable_ID,GimpCloneType             clone_type,gdouble                   src_x,gdouble                   src_y,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_clone_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_picker</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    image_ID,gint32                    drawable_ID,gdouble                   x,gdouble                   y,gboolean                  sample_merged,gboolean                  sample_average,gdouble                   average_radius,gboolean                  save_color,guchar                   *red,guchar                   *green,guchar                   *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_convolve</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   pressure,GimpConvolveType          convolve_type,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_convolve_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_crop</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    image_ID,gint                      new_width,gint                      new_height,gint                      offx,gint                      offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dodgeburn</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   exposure,GimpDodgeBurnType         dodgeburn_type,GimpDodgeBurnMode         dodgeburn_mode,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_dodgeburn_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_ellipse_select</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    image_ID,gdouble                   x,gdouble                   y,gdouble                   width,gdouble                   height,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_eraser</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes,GimpBrushApplicationMode  hardness,GimpPaintApplicationMode  method
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_eraser_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_flip</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,GimpOrientationType       flip_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_free_select</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    image_ID,gint                      num_segs,gdouble                  *segs,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_fuzzy_select</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   x,gdouble                   y,gint                      threshold,GimpChannelOps            operation,gboolean                  antialias,gboolean                  feather,gdouble                   feather_radius,gboolean                  sample_merged
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_paintbrush</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   fade_out,gint                      num_strokes,gdouble                  *strokes,GimpPaintApplicationMode  method,gdouble                   gradient_length
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_paintbrush_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_pencil</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_perspective</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,gboolean                  interpolation,gdouble                   x0,gdouble                   y0,gdouble                   x1,gdouble                   y1,gdouble                   x2,gdouble                   y2,gdouble                   x3,gdouble                   y3
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_rect_select</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    image_ID,gdouble                   x,gdouble                   y,gdouble                   width,gdouble                   height,GimpChannelOps            operation,gboolean                  feather,gdouble                   feather_radius
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_rotate</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,gboolean                  interpolation,gdouble                   angle
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_scale</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,gboolean                  interpolation,gdouble                   x0,gdouble                   y0,gdouble                   x1,gdouble                   y1
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_shear</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,gboolean                  interpolation,GimpOrientationType       shear_type,gdouble                   magnitude
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_smudge</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gdouble                   pressure,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_smudge_default</NAME>
-<RETURNS>void  </RETURNS>
-gint32                    drawable_ID,gint                      num_strokes,gdouble                  *strokes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_transform_2d</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                    drawable_ID,gboolean                  interpolation,gdouble                   source_x,gdouble                   source_y,gdouble                   scale_x,gdouble                   scale_y,gdouble                   angle,gdouble                   dest_x,gdouble                   dest_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_ops_offset</NAME>
-<RETURNS>void  </RETURNS>
-gint32                drawable_ID,gboolean              wrap_around,GimpChannelOffsetType fill_type,gint                  offset_x,gint                  offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_ops_duplicate</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32                image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_get_list</NAME>
-<RETURNS>gchar **</RETURNS>
-gint    *num_gradients
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_get_active</NAME>
-<RETURNS>gchar *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_set_active</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_sample_uniform</NAME>
-<RETURNS>gdouble *</RETURNS>
-gint     num_samples
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_sample_custom</NAME>
-<RETURNS>gdouble *</RETURNS>
-gint     num_samples,gdouble *positions
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_version</NAME>
-<RETURNS>gchar *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_list</NAME>
-<RETURNS>gchar **</RETURNS>
-gint32    image_ID,gint     *num_paths
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_get_points</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    image_ID,gchar    *pathname,gint     *path_closed,gint     *num_path_point_details,gdouble **points_pairs
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_get_current</NAME>
-<RETURNS>gchar *</RETURNS>
-gint32    image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_set_current</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gchar    *set_current_path_name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_set_points</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gchar    *pathname,gint      ptype,gint      num_path_points,gdouble  *points_pairs
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_stroke_current</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_get_point_at_dist</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    image_ID,gdouble   distance,gint     *y_point,gdouble  *gradient
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_get_tattoo</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    image_ID,gchar    *pathname
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_get_path_by_tattoo</NAME>
-<RETURNS>gchar *</RETURNS>
-gint32    image_ID,gint      tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gchar    *path_name_to_del
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_get_locked</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    image_ID,gchar    *pathname
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_set_locked</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gchar    *pathname,gint      lockstatus
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_path_set_tattoo</NAME>
-<RETURNS>void  </RETURNS>
-gint32    image_ID,gchar    *pathname,gint      tattovalue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_remove</NAME>
-<RETURNS>void  </RETURNS>
-gint32   floating_sel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_anchor</NAME>
-<RETURNS>void  </RETURNS>
-gint32   floating_sel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_to_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32   floating_sel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32   layer_ID,gint32   drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_rigor</NAME>
-<RETURNS>void  </RETURNS>
-gint32   floating_sel_ID,gboolean undo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_floating_sel_relax</NAME>
-<RETURNS>void  </RETURNS>
-gint32   floating_sel_ID,gboolean undo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_brightness_contrast</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,gint                brightness,gint                contrast
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_levels</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpChannelLutType  channel,gint                low_input,gint                high_input,gdouble             gamma,gint                low_output,gint                high_output
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_posterize</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,gint                levels
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_desaturate</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_equalize</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,gboolean            mask_only
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_invert</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_curves_spline</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpChannelLutType  channel,gint                num_points,guint8             *control_pts
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_curves_explicit</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpChannelLutType  channel,gint                num_bytes,guint8             *curve
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_color_balance</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpTransferMode    transfer_mode,gboolean            preserve_lum,gdouble             cyan_red,gdouble             magenta_green,gdouble             yellow_blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_histogram</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpChannelLutType  channel,gint                start_range,gint                end_range,gdouble            *mean,gdouble            *std_dev,gdouble            *median,gdouble            *pixels,gdouble            *count,gdouble            *percentile
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_hue_saturation</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,GimpHueRange        hue_range,gdouble             hue_offset,gdouble             lightness,gdouble             saturation
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_threshold</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,gint                low_threshold,gint                high_threshold
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_undo_push_group_start</NAME>
-<RETURNS>void  </RETURNS>
-gint32 image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_undo_push_group_end</NAME>
-<RETURNS>void  </RETURNS>
-gint32 image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_cut</NAME>
-<RETURNS>void  </RETURNS>
-gint32       drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_copy</NAME>
-<RETURNS>void  </RETURNS>
-gint32       drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_paste</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32       drawable_ID,gboolean     paste_into
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_clear</NAME>
-<RETURNS>void  </RETURNS>
-gint32       drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_fill</NAME>
-<RETURNS>void  </RETURNS>
-gint32       drawable_ID,GimpFillType fill_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_edit_stroke</NAME>
-<RETURNS>void  </RETURNS>
-gint32       drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_float</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID,gint32 drawable_ID,gint   offx,gint   offy
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_get_gradient_data</NAME>
-<RETURNS>gchar  *</RETURNS>
-gchar    *name,gint     *width,gint      sample_size,gdouble **grad_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32    image_ID,gchar    *name,guint     width,guint     height,gdouble   opacity,guchar   *color
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_copy</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_color</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,guchar   *red,guchar   *green,guchar   *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_name</NAME>
-<RETURNS>gchar     *</RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_opacity</NAME>
-<RETURNS>gdouble  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_show_masked</NAME>
-<RETURNS>gint  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_color</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,guchar    red,guchar    green,guchar    blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_name</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gchar    *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_opacity</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gdouble   opacity
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_show_masked</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gint      show_masked
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32    channel_ID,gboolean  visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_channel_get_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32    channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_display_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32 image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_display_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32 display_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_displays_flush</NAME>
-<RETURNS>void  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_update</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gint          x,gint          y,guint         width,guint         height
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_merge_shadow</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gboolean      undoable
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_image_id</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_width</NAME>
-<RETURNS>guint  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_height</NAME>
-<RETURNS>guint  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_bpp</NAME>
-<RETURNS>guint  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_type</NAME>
-<RETURNS>GimpImageType  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_channel</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_rgb</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_gray</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_has_alpha</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_indexed</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_layer</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_is_layer_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_mask_bounds</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        drawable_ID,gint         *x1,gint         *y1,gint         *x2,gint         *y2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_offsets</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gint         *offset_x,gint         *offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_fill</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,GimpFillType  fill_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,gint          visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_find</NAME>
-<RETURNS>GimpParasite   *</RETURNS>
-gint32        drawable_ID,const gchar  *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_attach_new_parasite</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,const gchar  *name,gint          flags,gint          size,const gpointer data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32        drawable_ID,const gchar  *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_get_thumbnail_data</NAME>
-<RETURNS>guchar         *</RETURNS>
-gint32        drawable_ID,gint         *width,gint         *height,gint         *bytes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_magic_load_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *name,gchar *extensions,gchar *prefixes,gchar *magics
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_load_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *name,gchar *extensions,gchar *prefixes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_register_save_handler</NAME>
-<RETURNS>void  </RETURNS>
-gchar *name,gchar *extensions,gchar *prefixes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_get_list</NAME>
-<RETURNS>gchar    **</RETURNS>
-gint    *num_gradients
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_get_active</NAME>
-<RETURNS>gchar     *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_set_active</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_sample_uniform</NAME>
-<RETURNS>gdouble   *</RETURNS>
-gint     num_samples
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_gradients_sample_custom</NAME>
-<RETURNS>gdouble   *</RETURNS>
-gint     num_samples,gdouble *positions
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_hguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     yposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_vguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     xposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_delete_guide</NAME>
-<RETURNS>void  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_find_next_guide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_orientation</NAME>
-<RETURNS>GOrientation  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_position</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_help</NAME>
-<RETURNS>void  </RETURNS>
-gchar *prog_name,gchar *help_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_new</NAME>
-<RETURNS>gint32  </RETURNS>
-guint          width,guint          height,GimpImageBaseType type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_duplicate</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_width</NAME>
-<RETURNS>guint  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_height</NAME>
-<RETURNS>guint  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_base_type</NAME>
-<RETURNS>GimpImageBaseType  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_floating_selection</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         channel_ID,gint           position
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID,gint           position
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_layer_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID,gint32         mask_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_clean_all</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_disable</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_enable</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_freeze</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_undo_thaw</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_undo_push_group_start</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_undo_push_group_end</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_clean_all</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_flatten</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_lower_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_lower_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_merge_visible_layers</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID,GimpMergeType  merge_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_pick_correlate_layer</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID,gint           x,gint           y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_raise_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_raise_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_remove_layer_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID,gint           mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_resize</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,guint          new_width,guint          new_height,gint           offset_x,gint           offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_active_channel</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_active_layer</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_channels</NAME>
-<RETURNS>gint32        *</RETURNS>
-gint32         image_ID,gint          *nchannels
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_cmap</NAME>
-<RETURNS>guchar        *</RETURNS>
-gint32         image_ID,gint          *ncolors
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_component_active</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         image_ID,gint           component
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_component_visible</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32         image_ID,gint           component
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_filename</NAME>
-<RETURNS>gchar         *</RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_layers</NAME>
-<RETURNS>gint32        *</RETURNS>
-gint32         image_ID,gint          *nlayers
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_selection</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_active_channel</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         channel_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_active_layer</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint32         layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_cmap</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,guchar        *cmap,gint           ncolors
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_component_active</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint           component,gboolean       active
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_component_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gint           component,gboolean       visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_filename</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gchar         *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_find</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-gint32         image_ID,const gchar   *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_attach_new_parasite</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,const gchar   *name,gint           flags,gint           size,const gpointer data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,const gchar   *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_resolution</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gdouble        xresolution,gdouble        yresolution
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_resolution</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,gdouble       *xresolution,gdouble       *yresolution
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_set_unit</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,GimpUnit       unit
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_unit</NAME>
-<RETURNS>GimpUnit  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_layer_by_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID,gint32         tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_channel_by_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32         image_ID,gint32         tattoo
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_thumbnail_data</NAME>
-<RETURNS>guchar        *</RETURNS>
-gint32         image_ID,gint          *width,gint          *height,gint          *bytes
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_convert_rgb</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_convert_grayscale</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_convert_indexed</NAME>
-<RETURNS>void  </RETURNS>
-gint32         image_ID,GimpConvertDitherType  dither_type,GimpConvertPaletteType palette_type,gint           num_colors,gint           alpha_dither,gint           remove_unused,gchar         *palette
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_list</NAME>
-<RETURNS>gint32       *</RETURNS>
-gint          *nimages
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_hguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     yposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_add_vguide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     xposition
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_delete_guide</NAME>
-<RETURNS>void  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_find_next_guide</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_orientation</NAME>
-<RETURNS>GOrientation  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_get_guide_position</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32     image_ID,gint32     guide_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_new</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        image_ID,char         *name,guint         width,guint         height,GimpImageType type,gdouble       opacity,GLayerMode    mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_copy</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_delete</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_add_alpha</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_create_mask</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        layer_ID,GimpAddMaskType mask_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_resize</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,guint         new_width,guint         new_height,gint          offset_x,gint          offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_scale</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,guint         new_width,guint         new_height,gint          local_origin
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_translate</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gint          offset_x,gint          offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_is_floating_selection</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_image_id</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_mask_id</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_apply_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_edit_mask</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_mode</NAME>
-<RETURNS>GLayerMode  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_name</NAME>
-<RETURNS>gchar          *</RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_opacity</NAME>
-<RETURNS>gdouble  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_preserve_transparency</NAME>
-<RETURNS>gboolean  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_show_mask</NAME>
-<RETURNS>gint  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_visible</NAME>
-<RETURNS>gint  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_apply_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gboolean      apply_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_edit_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gboolean      edit_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_mode</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,GLayerMode    mode
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_name</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_offsets</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gint          offset_x,gint          offset_y
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_opacity</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gdouble       opacity
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_preserve_transparency</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gboolean      preserve_transparency
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_show_mask</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gboolean      show_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_set_visible</NAME>
-<RETURNS>void  </RETURNS>
-gint32        layer_ID,gboolean      visible
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_layer_get_tattoo</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32        layer_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_message</NAME>
-<RETURNS>void  </RETURNS>
-const gchar *message
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_get_background</NAME>
-<RETURNS>void  </RETURNS>
-guchar *red,guchar *green,guchar *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_get_foreground</NAME>
-<RETURNS>void  </RETURNS>
-guchar *red,guchar *green,guchar *blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_set_background</NAME>
-<RETURNS>void  </RETURNS>
-guchar  red,guchar  green,guchar  blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_palette_set_foreground</NAME>
-<RETURNS>void  </RETURNS>
-guchar  red,guchar  green,guchar  blue
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_find</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_find</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-gint32              drawable_ID,const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_drawable_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32              drawable_ID,const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_find</NAME>
-<RETURNS>GimpParasite  *</RETURNS>
-gint32              image_ID,const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_attach</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,const GimpParasite *parasite
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_image_parasite_detach</NAME>
-<RETURNS>void  </RETURNS>
-gint32              image_ID,const gchar        *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_progress_init</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *message
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_progress_update</NAME>
-<RETURNS>void  </RETURNS>
-gdouble  percentage
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_plugin_domain_register</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *domain_name,gchar   *domain_path
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_plugin_help_register</NAME>
-<RETURNS>void  </RETURNS>
-gchar   *help_path
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_set_data</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *id,gpointer  data,guint32   length
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_get_data</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *id,gpointer  data
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_get_data_size</NAME>
-<RETURNS>guint32  </RETURNS>
-gchar    *id
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_query</NAME>
-<RETURNS>void  </RETURNS>
-gchar    *name_regexp,gchar    *blurb_regexp,gchar    *help_regexp,gchar    *author_regexp,gchar    *copyright_regexp,gchar    *date_regexp,gchar    *proc_type_regexp,gint     *nprocs,gchar  ***proc_names
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_arg</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar        *proc_name,gint          nth_arg,GimpParamDef *param
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_val</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar        *proc_name,gint          nth_val,GimpParamDef *param
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_procedural_db_proc_info</NAME>
-<RETURNS>gboolean  </RETURNS>
-gchar         *proc_name,gchar        **proc_blurb,gchar        **proc_help,gchar        **proc_author,gchar        **proc_copyright,gchar        **proc_date,gint          *proc_type,gint          *nparams,gint          *nreturn_vals,GimpParamDef **params,GimpParamDef **return_vals
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_bounds</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32  image_ID,gint32 *non_empty,gint32 *x1,gint32 *y1,gint32 *x2,gint32 *y2
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_float</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32  image_ID,gint32  drawable_ID,gint32  x_offset,gint32  y_offset
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_is_empty</NAME>
-<RETURNS>gint32  </RETURNS>
-gint32  image_ID
-</FUNCTION>
-<FUNCTION>
-<NAME>gimp_selection_none</NAME>
-<RETURNS>void  </RETURNS>
-gint32  image_ID
-</FUNCTION>
diff --git a/devel-docs/libgimp/libgimp-include.c b/devel-docs/libgimp/libgimp-include.c
index f775e31258..7cf3ab988d 100644
--- a/devel-docs/libgimp/libgimp-include.c
+++ b/devel-docs/libgimp/libgimp-include.c
@@ -6,7 +6,7 @@
 #include <glib.h>
 #include <libgimp/gimp.h>
 
-GPlugInInfo PLUG_IN_INFO =
+GimpPlugInInfo PLUG_IN_INFO =
 {
   NULL,
   NULL, 
diff --git a/devel-docs/libgimp/libgimp-sections.txt b/devel-docs/libgimp/libgimp-sections.txt
index a0d350ac6e..fe383cf140 100644
--- a/devel-docs/libgimp/libgimp-sections.txt
+++ b/devel-docs/libgimp/libgimp-sections.txt
@@ -15,7 +15,6 @@ GimpParamColor
 GimpParamRegion
 GimpParamData
 GimpParam
-set_gimp_PLUG_IN_INFO_PTR
 MAIN
 gimp_main
 gimp_default_display
@@ -31,7 +30,6 @@ gimp_install_cmap
 gimp_use_xshm
 gimp_color_cube
 gimp_min_colors
-gimp_request_wakeups
 gimp_get_progname
 </SECTION>
 
@@ -61,7 +59,6 @@ gp_temp_proc_return_write
 gp_proc_install_write
 gp_proc_uninstall_write
 gp_extension_ack_write
-gp_request_wakeups_write
 </SECTION>
 
 <SECTION>
@@ -128,83 +125,6 @@ GimpRunModeType
 GimpSizeType
 GimpStackTraceMode
 GimpTransferMode
-GFillType
-GImageType
-GDrawableType
-GLayerMode
-GRunModeType
-GOrientation
-GParamType
-GProcedureType
-GStatusType
-PARAM_INT32
-PARAM_INT16
-PARAM_INT8
-PARAM_FLOAT
-PARAM_STRING
-PARAM_INT32ARRAY
-PARAM_INT16ARRAY
-PARAM_INT8ARRAY
-PARAM_FLOATARRAY
-PARAM_STRINGARRAY
-PARAM_COLOR
-PARAM_REGION
-PARAM_DISPLAY
-PARAM_IMAGE
-PARAM_LAYER
-PARAM_CHANNEL
-PARAM_DRAWABLE
-PARAM_SELECTION
-PARAM_BOUNDARY
-PARAM_PATH
-PARAM_PARASITE
-PARAM_STATUS
-PARAM_END
-STATUS_EXECUTION_ERROR
-STATUS_CALLING_ERROR
-STATUS_PASS_THROUGH
-STATUS_SUCCESS
-STATUS_CANCEL
-PROC_INTERNAL
-PROC_PLUG_IN
-PROC_EXTENSION
-PROC_TEMPORARY
-ORIENTATION_HORIZONTAL
-ORIENTATION_VERTICAL
-ORIENTATION_UNKNOWN
-FG_IMAGE_FILL
-BG_IMAGE_FILL
-WHITE_IMAGE_FILL
-TRANS_IMAGE_FILL
-NO_IMAGE_FILL
-RGB
-GRAY
-INDEXED
-RGB_IMAGE
-RGBA_IMAGE
-GRAY_IMAGE
-GRAYA_IMAGE
-INDEXED_IMAGE
-INDEXEDA_IMAGE
-NORMAL_MODE
-DISSOLVE_MODE
-BEHIND_MODE
-MULTIPLY_MODE
-SCREEN_MODE
-OVERLAY_MODE
-DIFFERENCE_MODE
-ADDITION_MODE
-SUBTRACT_MODE
-DARKEN_ONLY_MODE
-LIGHTEN_ONLY_MODE
-HUE_MODE
-SATURATION_MODE
-COLOR_MODE
-VALUE_MODE
-DIVIDE_MODE
-RUN_INTERACTIVE
-RUN_NONINTERACTIVE
-RUN_WITH_LAST_VALS
 </SECTION>
 
 
@@ -434,6 +354,83 @@ gimp_pixpipe_params_build
 
 <SECTION>
 <FILE>gimpcompat</FILE>
+GFillType
+GImageType
+GDrawableType
+GLayerMode
+GRunModeType
+GOrientation
+GParamType
+GProcedureType
+GStatusType
+PARAM_INT32
+PARAM_INT16
+PARAM_INT8
+PARAM_FLOAT
+PARAM_STRING
+PARAM_INT32ARRAY
+PARAM_INT16ARRAY
+PARAM_INT8ARRAY
+PARAM_FLOATARRAY
+PARAM_STRINGARRAY
+PARAM_COLOR
+PARAM_REGION
+PARAM_DISPLAY
+PARAM_IMAGE
+PARAM_LAYER
+PARAM_CHANNEL
+PARAM_DRAWABLE
+PARAM_SELECTION
+PARAM_BOUNDARY
+PARAM_PATH
+PARAM_PARASITE
+PARAM_STATUS
+PARAM_END
+STATUS_EXECUTION_ERROR
+STATUS_CALLING_ERROR
+STATUS_PASS_THROUGH
+STATUS_SUCCESS
+STATUS_CANCEL
+PROC_INTERNAL
+PROC_PLUG_IN
+PROC_EXTENSION
+PROC_TEMPORARY
+ORIENTATION_HORIZONTAL
+ORIENTATION_VERTICAL
+ORIENTATION_UNKNOWN
+FG_IMAGE_FILL
+BG_IMAGE_FILL
+WHITE_IMAGE_FILL
+TRANS_IMAGE_FILL
+NO_IMAGE_FILL
+RGB
+GRAY
+INDEXED
+RGB_IMAGE
+RGBA_IMAGE
+GRAY_IMAGE
+GRAYA_IMAGE
+INDEXED_IMAGE
+INDEXEDA_IMAGE
+NORMAL_MODE
+DISSOLVE_MODE
+BEHIND_MODE
+MULTIPLY_MODE
+SCREEN_MODE
+OVERLAY_MODE
+DIFFERENCE_MODE
+ADDITION_MODE
+SUBTRACT_MODE
+DARKEN_ONLY_MODE
+LIGHTEN_ONLY_MODE
+HUE_MODE
+SATURATION_MODE
+COLOR_MODE
+VALUE_MODE
+DIVIDE_MODE
+RUN_INTERACTIVE
+RUN_NONINTERACTIVE
+RUN_WITH_LAST_VALS
 gimp_attach_parasite
 gimp_detach_parasite
 gimp_find_parasite
@@ -500,6 +497,16 @@ GParamRegion
 GParamData
 GParamDef
 GParam
+CAN_HANDLE_INDEXED
+EXPORT_IGNORE
+CAN_HANDLE_RGB
+CAN_HANDLE_ALPHA
+EXPORT_CANCEL
+CAN_HANDLE_LAYERS_AS_ANIMATION
+CAN_HANDLE_GRAY
+NEEDS_ALPHA
+EXPORT_EXPORT
+CAN_HANDLE_LAYERS
 </SECTION>
 
 <SECTION>
@@ -1190,4 +1197,5 @@ gimp_table_attach_aligned
 <SECTION>
 <FILE>gimputils</FILE>
 gimp_strescape
+gimp_strcompress
 </SECTION>
diff --git a/devel-docs/libgimp/tmpl/gimp.sgml b/devel-docs/libgimp/tmpl/gimp.sgml
index 40893554c6..2ef180e9df 100644
--- a/devel-docs/libgimp/tmpl/gimp.sgml
+++ b/devel-docs/libgimp/tmpl/gimp.sgml
@@ -144,14 +144,6 @@ all other GIMP Library headers.
 </para>
 
 
-<!-- ##### FUNCTION set_gimp_PLUG_IN_INFO_PTR ##### -->
-<para>
-
-</para>
-
-@Param1: 
-
-
 <!-- ##### MACRO MAIN ##### -->
 <para>
 
@@ -307,13 +299,6 @@ all other GIMP Library headers.
 @Returns: 
 
 
-<!-- ##### FUNCTION gimp_request_wakeups ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION gimp_get_progname ##### -->
 <para>
 
diff --git a/devel-docs/libgimp/tmpl/gimpbrushes.sgml b/devel-docs/libgimp/tmpl/gimpbrushes.sgml
index 4eaaa89209..6a0b96d4ca 100644
--- a/devel-docs/libgimp/tmpl/gimpbrushes.sgml
+++ b/devel-docs/libgimp/tmpl/gimpbrushes.sgml
@@ -25,6 +25,7 @@ gimpbrushes
 @opacity: 
 @spacing: 
 @paint_mode: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_brushes_close_popup ##### -->
@@ -33,6 +34,7 @@ gimpbrushes
 </para>
 
 @brush_callback: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_brushes_set_popup ##### -->
@@ -45,6 +47,7 @@ gimpbrushes
 @opacity: 
 @spacing: 
 @paint_mode: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_brushes_get_brush_data ##### -->
@@ -52,16 +55,18 @@ gimpbrushes
 
 </para>
 
-@brush_name: 
+@name: 
 @opacity: 
 @spacing: 
 @paint_mode: 
 @width: 
 @height: 
-@mask_data_size: 
+@length: 
 @mask_data: 
 @Returns: 
 <!-- # Unused Parameters # -->
+@brush_name: 
+@mask_data_size: 
 @pname: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpchannel.sgml b/devel-docs/libgimp/tmpl/gimpchannel.sgml
index 84c6ccbce1..fe49639af6 100644
--- a/devel-docs/libgimp/tmpl/gimpchannel.sgml
+++ b/devel-docs/libgimp/tmpl/gimpchannel.sgml
@@ -43,6 +43,7 @@ gimpchannel
 </para>
 
 @channel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_name ##### -->
@@ -61,6 +62,7 @@ gimpchannel
 
 @channel_ID: 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_visible ##### -->
@@ -79,6 +81,7 @@ gimpchannel
 
 @channel_ID: 
 @visible: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_show_masked ##### -->
@@ -97,6 +100,7 @@ gimpchannel
 
 @channel_ID: 
 @show_masked: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_opacity ##### -->
@@ -115,6 +119,7 @@ gimpchannel
 
 @channel_ID: 
 @opacity: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_color ##### -->
@@ -126,6 +131,7 @@ gimpchannel
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_set_color ##### -->
@@ -137,6 +143,7 @@ gimpchannel
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_get_tattoo ##### -->
@@ -155,6 +162,7 @@ gimpchannel
 
 @channel_ID: 
 @tattoo: 
+@Returns: 
 
 
 <!-- ##### MACRO gimp_channel_get_image_id ##### -->
@@ -162,8 +170,5 @@ gimpchannel
 
 </para>
 
-@Returns: 
-<!-- # Unused Parameters # -->
-@channel_ID: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpchannelops.sgml b/devel-docs/libgimp/tmpl/gimpchannelops.sgml
index e274e05b7b..fc0528a7cc 100644
--- a/devel-docs/libgimp/tmpl/gimpchannelops.sgml
+++ b/devel-docs/libgimp/tmpl/gimpchannelops.sgml
@@ -24,6 +24,7 @@ gimpchannelops
 @fill_type: 
 @offset_x: 
 @offset_y: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_channel_ops_duplicate ##### -->
diff --git a/devel-docs/libgimp/tmpl/gimpcolor.sgml b/devel-docs/libgimp/tmpl/gimpcolor.sgml
index f37b874e3d..af45e1d62c 100644
--- a/devel-docs/libgimp/tmpl/gimpcolor.sgml
+++ b/devel-docs/libgimp/tmpl/gimpcolor.sgml
@@ -22,6 +22,7 @@ gimpcolor
 @drawable_ID: 
 @brightness: 
 @contrast: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_levels ##### -->
@@ -36,6 +37,7 @@ gimpcolor
 @gamma: 
 @low_output: 
 @high_output: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_posterize ##### -->
@@ -45,6 +47,7 @@ gimpcolor
 
 @drawable_ID: 
 @levels: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_desaturate ##### -->
@@ -53,6 +56,7 @@ gimpcolor
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_equalize ##### -->
@@ -62,6 +66,7 @@ gimpcolor
 
 @drawable_ID: 
 @mask_only: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_invert ##### -->
@@ -70,6 +75,7 @@ gimpcolor
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_curves_spline ##### -->
@@ -81,6 +87,7 @@ gimpcolor
 @channel: 
 @num_points: 
 @control_pts: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_curves_explicit ##### -->
@@ -92,6 +99,7 @@ gimpcolor
 @channel: 
 @num_bytes: 
 @curve: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_color_balance ##### -->
@@ -105,6 +113,7 @@ gimpcolor
 @cyan_red: 
 @magenta_green: 
 @yellow_blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_histogram ##### -->
@@ -122,6 +131,7 @@ gimpcolor
 @pixels: 
 @count: 
 @percentile: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_hue_saturation ##### -->
@@ -134,6 +144,7 @@ gimpcolor
 @hue_offset: 
 @lightness: 
 @saturation: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_threshold ##### -->
@@ -144,5 +155,6 @@ gimpcolor
 @drawable_ID: 
 @low_threshold: 
 @high_threshold: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpcompat.sgml b/devel-docs/libgimp/tmpl/gimpcompat.sgml
index a8b2b79e8d..21d7d20cef 100644
--- a/devel-docs/libgimp/tmpl/gimpcompat.sgml
+++ b/devel-docs/libgimp/tmpl/gimpcompat.sgml
@@ -6,7 +6,9 @@ Compatibility definitions for older plug-ins.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Compatibility definitions for older plug-ins.
+Compatibility definitions for older plug-ins. You have to define
+GIMP_ENABLE_COMPAT_CRUFT before including gimp.h to use these
+definitions.
 
 </para>
 
@@ -15,6 +17,536 @@ Compatibility definitions for older plug-ins.
 
 </para>
 
+<!-- ##### TYPEDEF GFillType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GImageType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GDrawableType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GLayerMode ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GRunModeType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GOrientation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GParamType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GProcedureType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GStatusType ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO PARAM_INT32 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_INT16 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_INT8 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_FLOAT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_STRING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_INT32ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_INT16ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_INT8ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_FLOATARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_STRINGARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_COLOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_REGION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_DISPLAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_LAYER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_CHANNEL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_DRAWABLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_SELECTION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_BOUNDARY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_PARASITE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_STATUS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PARAM_END ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STATUS_EXECUTION_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STATUS_CALLING_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STATUS_PASS_THROUGH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STATUS_SUCCESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STATUS_CANCEL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PROC_INTERNAL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PROC_PLUG_IN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PROC_EXTENSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PROC_TEMPORARY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ORIENTATION_HORIZONTAL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ORIENTATION_VERTICAL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ORIENTATION_UNKNOWN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO FG_IMAGE_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BG_IMAGE_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO WHITE_IMAGE_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO TRANS_IMAGE_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NO_IMAGE_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RGB ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO INDEXED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RGB_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RGBA_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GRAY_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GRAYA_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO INDEXED_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO INDEXEDA_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NORMAL_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DISSOLVE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BEHIND_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO MULTIPLY_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO SCREEN_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO OVERLAY_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DIFFERENCE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ADDITION_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO SUBTRACT_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DARKEN_ONLY_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO LIGHTEN_ONLY_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HUE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO SATURATION_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO COLOR_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO VALUE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DIVIDE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RUN_INTERACTIVE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RUN_NONINTERACTIVE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO RUN_WITH_LAST_VALS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO gimp_attach_parasite ##### -->
 <para>
 
@@ -564,3 +1096,73 @@ Compatibility definitions for older plug-ins.
 
 
 
+<!-- ##### MACRO CAN_HANDLE_INDEXED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO EXPORT_IGNORE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAN_HANDLE_RGB ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAN_HANDLE_ALPHA ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO EXPORT_CANCEL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAN_HANDLE_LAYERS_AS_ANIMATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAN_HANDLE_GRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NEEDS_ALPHA ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO EXPORT_EXPORT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAN_HANDLE_LAYERS ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/devel-docs/libgimp/tmpl/gimpconvert.sgml b/devel-docs/libgimp/tmpl/gimpconvert.sgml
index e5d677333a..250096ee15 100644
--- a/devel-docs/libgimp/tmpl/gimpconvert.sgml
+++ b/devel-docs/libgimp/tmpl/gimpconvert.sgml
@@ -20,6 +20,7 @@ gimpconvert
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_convert_grayscale ##### -->
@@ -28,6 +29,7 @@ gimpconvert
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_convert_indexed ##### -->
@@ -42,5 +44,6 @@ gimpconvert
 @alpha_dither: 
 @remove_unused: 
 @palette: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpdisplay.sgml b/devel-docs/libgimp/tmpl/gimpdisplay.sgml
index f75e3f265b..f366b8ae0c 100644
--- a/devel-docs/libgimp/tmpl/gimpdisplay.sgml
+++ b/devel-docs/libgimp/tmpl/gimpdisplay.sgml
@@ -29,6 +29,7 @@ gimpdisplay
 </para>
 
 @display_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_displays_flush ##### -->
@@ -36,5 +37,6 @@ gimpdisplay
 
 </para>
 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpdrawable.sgml b/devel-docs/libgimp/tmpl/gimpdrawable.sgml
index dba36c7a88..34d6148da0 100644
--- a/devel-docs/libgimp/tmpl/gimpdrawable.sgml
+++ b/devel-docs/libgimp/tmpl/gimpdrawable.sgml
@@ -134,6 +134,7 @@ gimpdrawable
 
 @drawable_ID: 
 @undo: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @undoable: 
 
@@ -145,6 +146,7 @@ gimpdrawable
 
 @drawable_ID: 
 @fill_type: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_drawable_update ##### -->
@@ -157,6 +159,7 @@ gimpdrawable
 @y: 
 @width: 
 @height: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_drawable_mask_bounds ##### -->
@@ -270,6 +273,7 @@ gimpdrawable
 @drawable_ID: 
 @offset_x: 
 @offset_y: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_drawable_is_layer ##### -->
@@ -306,21 +310,23 @@ gimpdrawable
 
 
 
-<!-- ##### FUNCTION gimp_drawable_image_id ##### -->
+<!-- ##### MACRO gimp_drawable_image_id ##### -->
 <para>
 
 </para>
 
-@drawable_ID: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@drawable_ID: 
 
 
-<!-- ##### FUNCTION gimp_drawable_bpp ##### -->
+<!-- ##### MACRO gimp_drawable_bpp ##### -->
 <para>
 
 </para>
 
-@drawable_ID: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@drawable_ID: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpedit.sgml b/devel-docs/libgimp/tmpl/gimpedit.sgml
index 285e9735ff..a2ac28f812 100644
--- a/devel-docs/libgimp/tmpl/gimpedit.sgml
+++ b/devel-docs/libgimp/tmpl/gimpedit.sgml
@@ -20,6 +20,7 @@ gimpedit
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_edit_copy ##### -->
@@ -28,6 +29,7 @@ gimpedit
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_edit_paste ##### -->
@@ -46,6 +48,7 @@ gimpedit
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_edit_fill ##### -->
@@ -55,6 +58,7 @@ gimpedit
 
 @drawable_ID: 
 @fill_type: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_edit_stroke ##### -->
@@ -63,5 +67,6 @@ gimpedit
 </para>
 
 @drawable_ID: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpenums.sgml b/devel-docs/libgimp/tmpl/gimpenums.sgml
index 07815ce19f..e6028f1dc7 100644
--- a/devel-docs/libgimp/tmpl/gimpenums.sgml
+++ b/devel-docs/libgimp/tmpl/gimpenums.sgml
@@ -231,533 +231,3 @@ Enums and definitions.
 </para>
 
 
-<!-- ##### TYPEDEF GFillType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GImageType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GDrawableType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GLayerMode ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GRunModeType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GOrientation ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GParamType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GProcedureType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GStatusType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PARAM_INT32 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_INT16 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_INT8 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_FLOAT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_STRING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_INT32ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_INT16ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_INT8ARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_FLOATARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_STRINGARRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_COLOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_REGION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_DISPLAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_LAYER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_CHANNEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_DRAWABLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_SELECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_BOUNDARY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_PARASITE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_STATUS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PARAM_END ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO STATUS_EXECUTION_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO STATUS_CALLING_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO STATUS_PASS_THROUGH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO STATUS_SUCCESS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO STATUS_CANCEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PROC_INTERNAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PROC_PLUG_IN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PROC_EXTENSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO PROC_TEMPORARY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO ORIENTATION_HORIZONTAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO ORIENTATION_VERTICAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO ORIENTATION_UNKNOWN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO FG_IMAGE_FILL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO BG_IMAGE_FILL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO WHITE_IMAGE_FILL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO TRANS_IMAGE_FILL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NO_IMAGE_FILL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RGB ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GRAY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO INDEXED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RGB_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RGBA_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GRAY_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GRAYA_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO INDEXED_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO INDEXEDA_IMAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO NORMAL_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO DISSOLVE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO BEHIND_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MULTIPLY_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO SCREEN_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO OVERLAY_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO DIFFERENCE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO ADDITION_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO SUBTRACT_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO DARKEN_ONLY_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO LIGHTEN_ONLY_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO HUE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO SATURATION_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO COLOR_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO VALUE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO DIVIDE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RUN_INTERACTIVE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RUN_NONINTERACTIVE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO RUN_WITH_LAST_VALS ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/devel-docs/libgimp/tmpl/gimpfileops.sgml b/devel-docs/libgimp/tmpl/gimpfileops.sgml
index 7ace753774..4753a6fcbe 100644
--- a/devel-docs/libgimp/tmpl/gimpfileops.sgml
+++ b/devel-docs/libgimp/tmpl/gimpfileops.sgml
@@ -23,6 +23,7 @@ gimpfileops
 @extensions: 
 @prefixes: 
 @magics: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @name: 
 
@@ -35,6 +36,7 @@ gimpfileops
 @procedure_name: 
 @extensions: 
 @prefixes: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @name: 
 
@@ -47,6 +49,7 @@ gimpfileops
 @procedure_name: 
 @extensions: 
 @prefixes: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @name: 
 
diff --git a/devel-docs/libgimp/tmpl/gimpfloatingsel.sgml b/devel-docs/libgimp/tmpl/gimpfloatingsel.sgml
index 5d788a334c..d8b92b6eb1 100644
--- a/devel-docs/libgimp/tmpl/gimpfloatingsel.sgml
+++ b/devel-docs/libgimp/tmpl/gimpfloatingsel.sgml
@@ -20,6 +20,7 @@ gimpfloatingsel
 </para>
 
 @floating_sel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_floating_sel_anchor ##### -->
@@ -28,6 +29,7 @@ gimpfloatingsel
 </para>
 
 @floating_sel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_floating_sel_to_layer ##### -->
@@ -36,6 +38,7 @@ gimpfloatingsel
 </para>
 
 @floating_sel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_floating_sel_attach ##### -->
@@ -45,6 +48,7 @@ gimpfloatingsel
 
 @layer_ID: 
 @drawable_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_floating_sel_rigor ##### -->
@@ -54,6 +58,7 @@ gimpfloatingsel
 
 @floating_sel_ID: 
 @undo: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_floating_sel_relax ##### -->
@@ -63,5 +68,6 @@ gimpfloatingsel
 
 @floating_sel_ID: 
 @undo: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpgimprc.sgml b/devel-docs/libgimp/tmpl/gimpgimprc.sgml
index 84eac56d91..28dad4e4d0 100644
--- a/devel-docs/libgimp/tmpl/gimpgimprc.sgml
+++ b/devel-docs/libgimp/tmpl/gimpgimprc.sgml
@@ -30,6 +30,7 @@ gimpgimprc
 
 @token: 
 @value: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_get_monitor_resolution ##### -->
@@ -39,5 +40,6 @@ gimpgimprc
 
 @xres: 
 @yres: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpgradients.sgml b/devel-docs/libgimp/tmpl/gimpgradients.sgml
index f2ec8d4c9d..26ce2bbc43 100644
--- a/devel-docs/libgimp/tmpl/gimpgradients.sgml
+++ b/devel-docs/libgimp/tmpl/gimpgradients.sgml
@@ -37,6 +37,7 @@ gimpgradients
 </para>
 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_gradients_sample_uniform ##### -->
@@ -79,6 +80,7 @@ gimpgradients
 @popup_title: 
 @initial_gradient: 
 @sample_size: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_gradients_close_popup ##### -->
@@ -87,6 +89,7 @@ gimpgradients
 </para>
 
 @gradients_callback: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_gradients_set_popup ##### -->
@@ -96,5 +99,6 @@ gimpgradients
 
 @gradients_callback: 
 @gradient_name: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpguides.sgml b/devel-docs/libgimp/tmpl/gimpguides.sgml
index b7d39e5524..71367dc84c 100644
--- a/devel-docs/libgimp/tmpl/gimpguides.sgml
+++ b/devel-docs/libgimp/tmpl/gimpguides.sgml
@@ -41,6 +41,7 @@ gimpguides
 
 @image_ID: 
 @guide_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_find_next_guide ##### -->
diff --git a/devel-docs/libgimp/tmpl/gimphelp.sgml b/devel-docs/libgimp/tmpl/gimphelp.sgml
index 1701517687..44bde688c7 100644
--- a/devel-docs/libgimp/tmpl/gimphelp.sgml
+++ b/devel-docs/libgimp/tmpl/gimphelp.sgml
@@ -21,6 +21,7 @@ gimphelp
 
 @prog_name: 
 @help_page: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @help_data: 
 
diff --git a/devel-docs/libgimp/tmpl/gimpimage.sgml b/devel-docs/libgimp/tmpl/gimpimage.sgml
index 8f210b784d..41543d522d 100644
--- a/devel-docs/libgimp/tmpl/gimpimage.sgml
+++ b/devel-docs/libgimp/tmpl/gimpimage.sgml
@@ -44,6 +44,7 @@ gimpimage
 @new_height: 
 @offx: 
 @offy: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @offset_x: 
 @offset_y: 
@@ -57,6 +58,7 @@ gimpimage
 @image_ID: 
 @new_width: 
 @new_height: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_delete ##### -->
@@ -65,6 +67,7 @@ gimpimage
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_free_shadow ##### -->
@@ -73,6 +76,7 @@ gimpimage
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_layers ##### -->
@@ -105,6 +109,7 @@ gimpimage
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_pick_correlate_layer ##### -->
@@ -125,6 +130,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_lower_layer ##### -->
@@ -134,6 +140,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_raise_layer_to_top ##### -->
@@ -143,6 +150,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_lower_layer_to_bottom ##### -->
@@ -152,6 +160,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_merge_visible_layers ##### -->
@@ -192,6 +201,7 @@ gimpimage
 @image_ID: 
 @layer_ID: 
 @position: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_remove_layer ##### -->
@@ -201,6 +211,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_add_layer_mask ##### -->
@@ -211,6 +222,7 @@ gimpimage
 @image_ID: 
 @layer_ID: 
 @mask_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_remove_layer_mask ##### -->
@@ -221,6 +233,7 @@ gimpimage
 @image_ID: 
 @layer_ID: 
 @mode: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_raise_channel ##### -->
@@ -230,6 +243,7 @@ gimpimage
 
 @image_ID: 
 @channel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_lower_channel ##### -->
@@ -239,6 +253,7 @@ gimpimage
 
 @image_ID: 
 @layer_ID: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @channel_ID: 
 
@@ -251,6 +266,7 @@ gimpimage
 @image_ID: 
 @channel_ID: 
 @position: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_remove_channel ##### -->
@@ -260,6 +276,7 @@ gimpimage
 
 @image_ID: 
 @channel_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_active_drawable ##### -->
@@ -331,6 +348,7 @@ gimpimage
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_floating_selection ##### -->
@@ -358,6 +376,7 @@ gimpimage
 
 @image_ID: 
 @tattoo: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_tattoo_state ##### -->
@@ -403,6 +422,7 @@ gimpimage
 
 @image_ID: 
 @active_layer_ID: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @layer_ID: 
 
@@ -423,6 +443,7 @@ gimpimage
 
 @image_ID: 
 @active_channel_ID: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @channel_ID: 
 
@@ -454,6 +475,7 @@ gimpimage
 @image_ID: 
 @component: 
 @active: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_component_visible ##### -->
@@ -474,6 +496,7 @@ gimpimage
 @image_ID: 
 @component: 
 @visible: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_filename ##### -->
@@ -492,6 +515,7 @@ gimpimage
 
 @image_ID: 
 @filename: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @name: 
 
@@ -504,6 +528,7 @@ gimpimage
 @image_ID: 
 @xresolution: 
 @yresolution: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_set_resolution ##### -->
@@ -514,6 +539,7 @@ gimpimage
 @image_ID: 
 @xresolution: 
 @yresolution: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_unit ##### -->
@@ -532,6 +558,7 @@ gimpimage
 
 @image_ID: 
 @unit: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_get_layer_by_tattoo ##### -->
@@ -574,6 +601,7 @@ gimpimage
 @image_ID: 
 @cmap: 
 @num_colors: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @ncolors: 
 
@@ -592,27 +620,30 @@ gimpimage
 @bytes: 
 
 
-<!-- ##### FUNCTION gimp_image_convert_rgb ##### -->
+<!-- ##### MACRO gimp_image_convert_rgb ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @image_ID: 
 
 
-<!-- ##### FUNCTION gimp_image_convert_grayscale ##### -->
+<!-- ##### MACRO gimp_image_convert_grayscale ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @image_ID: 
 
 
-<!-- ##### FUNCTION gimp_image_convert_indexed ##### -->
+<!-- ##### MACRO gimp_image_convert_indexed ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @image_ID: 
 @dither_type: 
 @palette_type: 
@@ -622,12 +653,13 @@ gimpimage
 @palette: 
 
 
-<!-- ##### FUNCTION gimp_image_duplicate ##### -->
+<!-- ##### MACRO gimp_image_duplicate ##### -->
 <para>
 
 </para>
 
-@image_ID: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@image_ID: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimplayer.sgml b/devel-docs/libgimp/tmpl/gimplayer.sgml
index a4b0c1d75b..42748787ca 100644
--- a/devel-docs/libgimp/tmpl/gimplayer.sgml
+++ b/devel-docs/libgimp/tmpl/gimplayer.sgml
@@ -57,6 +57,7 @@ gimplayer
 @new_width: 
 @new_height: 
 @local_origin: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_resize ##### -->
@@ -69,6 +70,7 @@ gimplayer
 @new_height: 
 @offx: 
 @offy: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @offset_x: 
 @offset_y: 
@@ -80,6 +82,7 @@ gimplayer
 </para>
 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_translate ##### -->
@@ -90,6 +93,7 @@ gimplayer
 @layer_ID: 
 @offx: 
 @offy: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @offset_x: 
 @offset_y: 
@@ -101,6 +105,7 @@ gimplayer
 </para>
 
 @layer_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_set_offsets ##### -->
@@ -111,6 +116,7 @@ gimplayer
 @layer_ID: 
 @offx: 
 @offy: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @offset_x: 
 @offset_y: 
@@ -150,6 +156,7 @@ gimplayer
 
 @layer_ID: 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_visible ##### -->
@@ -168,6 +175,7 @@ gimplayer
 
 @layer_ID: 
 @visible: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_preserve_trans ##### -->
@@ -186,6 +194,7 @@ gimplayer
 
 @layer_ID: 
 @preserve_trans: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_apply_mask ##### -->
@@ -204,6 +213,7 @@ gimplayer
 
 @layer_ID: 
 @apply_mask: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_show_mask ##### -->
@@ -222,6 +232,7 @@ gimplayer
 
 @layer_ID: 
 @show_mask: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_edit_mask ##### -->
@@ -240,6 +251,7 @@ gimplayer
 
 @layer_ID: 
 @edit_mask: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_opacity ##### -->
@@ -258,6 +270,7 @@ gimplayer
 
 @layer_ID: 
 @opacity: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_mode ##### -->
@@ -276,6 +289,7 @@ gimplayer
 
 @layer_ID: 
 @mode: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_linked ##### -->
@@ -294,6 +308,7 @@ gimplayer
 
 @layer_ID: 
 @linked: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_layer_get_tattoo ##### -->
@@ -312,49 +327,55 @@ gimplayer
 
 @layer_ID: 
 @tattoo: 
-
-
-<!-- ##### FUNCTION gimp_layer_get_mask_id ##### -->
-<para>
-
-</para>
-
-@layer_ID: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gimp_layer_get_image_id ##### -->
+<!-- ##### MACRO gimp_layer_get_mask_id ##### -->
 <para>
 
 </para>
 
-@layer_ID: 
 @Returns: 
-
-
-<!-- ##### FUNCTION gimp_layer_is_floating_selection ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @layer_ID: 
-@Returns: 
 
 
-<!-- ##### FUNCTION gimp_layer_get_preserve_transparency ##### -->
+<!-- ##### MACRO gimp_layer_get_image_id ##### -->
 <para>
 
 </para>
 
+@Returns: 
+<!-- # Unused Parameters # -->
 @layer_ID: 
-@Returns: 
 
 
-<!-- ##### FUNCTION gimp_layer_set_preserve_transparency ##### -->
+<!-- ##### MACRO gimp_layer_is_floating_selection ##### -->
 <para>
 
 </para>
 
+@Returns: 
+<!-- # Unused Parameters # -->
+@layer_ID: 
+
+
+<!-- ##### MACRO gimp_layer_get_preserve_transparency ##### -->
+<para>
+
+</para>
+
+@Returns: 
+<!-- # Unused Parameters # -->
+@layer_ID: 
+
+
+<!-- ##### MACRO gimp_layer_set_preserve_transparency ##### -->
+<para>
+
+</para>
+
+<!-- # Unused Parameters # -->
 @layer_ID: 
 @preserve_transparency: 
 
diff --git a/devel-docs/libgimp/tmpl/gimpmessage.sgml b/devel-docs/libgimp/tmpl/gimpmessage.sgml
index 7e288b2843..93eaa0f4ad 100644
--- a/devel-docs/libgimp/tmpl/gimpmessage.sgml
+++ b/devel-docs/libgimp/tmpl/gimpmessage.sgml
@@ -20,6 +20,7 @@ gimpmessage
 </para>
 
 @message: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_message_get_handler ##### -->
@@ -36,5 +37,6 @@ gimpmessage
 </para>
 
 @handler: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimppalette.sgml b/devel-docs/libgimp/tmpl/gimppalette.sgml
index b2505d0640..8c26b1091c 100644
--- a/devel-docs/libgimp/tmpl/gimppalette.sgml
+++ b/devel-docs/libgimp/tmpl/gimppalette.sgml
@@ -22,6 +22,7 @@ gimppalette
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_get_background ##### -->
@@ -32,6 +33,7 @@ gimppalette
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_set_foreground ##### -->
@@ -42,6 +44,7 @@ gimppalette
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_set_background ##### -->
@@ -52,6 +55,7 @@ gimppalette
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_set_default_colors ##### -->
@@ -59,6 +63,7 @@ gimppalette
 
 </para>
 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_swap_colors ##### -->
@@ -66,6 +71,7 @@ gimppalette
 
 </para>
 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_palette_refresh ##### -->
@@ -73,5 +79,6 @@ gimppalette
 
 </para>
 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpparasite.sgml b/devel-docs/libgimp/tmpl/gimpparasite.sgml
index 000f4f1b34..50e3b4290b 100644
--- a/devel-docs/libgimp/tmpl/gimpparasite.sgml
+++ b/devel-docs/libgimp/tmpl/gimpparasite.sgml
@@ -206,6 +206,7 @@ gimp_parasite_attach() and their related functions.
 </para>
 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @p: 
 
@@ -216,6 +217,7 @@ gimp_parasite_attach() and their related functions.
 </para>
 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_parasite_list ##### -->
@@ -225,6 +227,7 @@ gimp_parasite_attach() and their related functions.
 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_drawable_parasite_find ##### -->
@@ -246,6 +249,7 @@ gimp_parasite_attach() and their related functions.
 
 @drawable_ID: 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @drawable: 
 @p: 
@@ -258,6 +262,7 @@ gimp_parasite_attach() and their related functions.
 
 @drawable_ID: 
 @name: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @drawable: 
 
@@ -270,6 +275,7 @@ gimp_parasite_attach() and their related functions.
 @drawable_ID: 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_parasite_find ##### -->
@@ -289,6 +295,7 @@ gimp_parasite_attach() and their related functions.
 
 @image_ID: 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @p: 
 
@@ -300,6 +307,7 @@ gimp_parasite_attach() and their related functions.
 
 @image_ID: 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_parasite_list ##### -->
@@ -310,6 +318,7 @@ gimp_parasite_attach() and their related functions.
 @image_ID: 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_attach_new_parasite ##### -->
diff --git a/devel-docs/libgimp/tmpl/gimpparasite.sgml.sgml b/devel-docs/libgimp/tmpl/gimpparasite.sgml.sgml
index b995162ec3..0c2d55b42c 100644
--- a/devel-docs/libgimp/tmpl/gimpparasite.sgml.sgml
+++ b/devel-docs/libgimp/tmpl/gimpparasite.sgml.sgml
@@ -204,6 +204,7 @@ gimpparasite.sgml
 </para>
 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @p: 
 
@@ -214,6 +215,7 @@ gimpparasite.sgml
 </para>
 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_parasite_list ##### -->
@@ -223,6 +225,7 @@ gimpparasite.sgml
 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_drawable_parasite_find ##### -->
@@ -244,6 +247,7 @@ gimpparasite.sgml
 
 @drawable_ID: 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @drawable: 
 @p: 
@@ -256,6 +260,7 @@ gimpparasite.sgml
 
 @drawable_ID: 
 @name: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @drawable: 
 
@@ -268,6 +273,7 @@ gimpparasite.sgml
 @drawable_ID: 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_parasite_find ##### -->
@@ -287,6 +293,7 @@ gimpparasite.sgml
 
 @image_ID: 
 @parasite: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @p: 
 
@@ -298,6 +305,7 @@ gimpparasite.sgml
 
 @image_ID: 
 @name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_image_parasite_list ##### -->
@@ -308,6 +316,7 @@ gimpparasite.sgml
 @image_ID: 
 @num_parasites: 
 @parasites: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_attach_new_parasite ##### -->
diff --git a/devel-docs/libgimp/tmpl/gimppaths.sgml b/devel-docs/libgimp/tmpl/gimppaths.sgml
index 641498c6a5..51fcf95ed3 100644
--- a/devel-docs/libgimp/tmpl/gimppaths.sgml
+++ b/devel-docs/libgimp/tmpl/gimppaths.sgml
@@ -53,6 +53,7 @@ gimppaths
 
 @image_ID: 
 @set_current_path_name: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_path_set_points ##### -->
@@ -65,6 +66,7 @@ gimppaths
 @ptype: 
 @num_path_points: 
 @points_pairs: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_path_stroke_current ##### -->
@@ -73,6 +75,7 @@ gimppaths
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_path_get_point_at_dist ##### -->
@@ -114,6 +117,7 @@ gimppaths
 
 @image_ID: 
 @path_name_to_del: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_path_get_locked ##### -->
@@ -134,6 +138,7 @@ gimppaths
 @image_ID: 
 @pathname: 
 @lockstatus: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_path_set_tattoo ##### -->
@@ -144,5 +149,6 @@ gimppaths
 @image_ID: 
 @pathname: 
 @tattovalue: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimppatterns.sgml b/devel-docs/libgimp/tmpl/gimppatterns.sgml
index fae396b056..93de1418a8 100644
--- a/devel-docs/libgimp/tmpl/gimppatterns.sgml
+++ b/devel-docs/libgimp/tmpl/gimppatterns.sgml
@@ -23,9 +23,11 @@ gimppatterns
 @width: 
 @height: 
 @mask_bpp: 
-@mask_data_size: 
+@length: 
 @mask_data: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@mask_data_size: 
 
 
 <!-- ##### FUNCTION gimp_patterns_popup ##### -->
@@ -36,6 +38,7 @@ gimppatterns
 @pattern_callback: 
 @popup_title: 
 @initial_pattern: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_patterns_close_popup ##### -->
@@ -44,6 +47,7 @@ gimppatterns
 </para>
 
 @pattern_callback: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_patterns_set_popup ##### -->
@@ -53,5 +57,6 @@ gimppatterns
 
 @pattern_callback: 
 @pattern_name: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpplugin.sgml b/devel-docs/libgimp/tmpl/gimpplugin.sgml
index 8d681d4301..6a5fe00459 100644
--- a/devel-docs/libgimp/tmpl/gimpplugin.sgml
+++ b/devel-docs/libgimp/tmpl/gimpplugin.sgml
@@ -20,6 +20,7 @@ gimpplugin
 </para>
 
 @message: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_progress_update ##### -->
@@ -28,6 +29,7 @@ gimpplugin
 </para>
 
 @percentage: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_temp_PDB_name ##### -->
@@ -45,6 +47,7 @@ gimpplugin
 
 @domain_name: 
 @domain_path: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_plugin_help_register ##### -->
@@ -53,5 +56,6 @@ gimpplugin
 </para>
 
 @help_path: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpproceduraldb.sgml b/devel-docs/libgimp/tmpl/gimpproceduraldb.sgml
index 80b2232f0d..b102e05611 100644
--- a/devel-docs/libgimp/tmpl/gimpproceduraldb.sgml
+++ b/devel-docs/libgimp/tmpl/gimpproceduraldb.sgml
@@ -40,6 +40,7 @@ gimpproceduraldb
 
 @identifier: 
 @data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_procedural_db_set_data ##### -->
@@ -50,6 +51,7 @@ gimpproceduraldb
 @identifier: 
 @data: 
 @length: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_procedural_db_dump ##### -->
@@ -58,6 +60,7 @@ gimpproceduraldb
 </para>
 
 @filename: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_procedural_db_query ##### -->
@@ -73,6 +76,9 @@ gimpproceduraldb
 @date: 
 @proc_type: 
 @num_matches: 
+@procedure_names: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @proc_names: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimpprotocol.sgml b/devel-docs/libgimp/tmpl/gimpprotocol.sgml
index 0f5e18996a..5d911794f7 100644
--- a/devel-docs/libgimp/tmpl/gimpprotocol.sgml
+++ b/devel-docs/libgimp/tmpl/gimpprotocol.sgml
@@ -206,12 +206,3 @@ The communication protocol between GIMP and it's plug-ins.
 @Returns: 
 
 
-<!-- ##### FUNCTION gp_request_wakeups_write ##### -->
-<para>
-
-</para>
-
-@channel: 
-@Returns: 
-
-
diff --git a/devel-docs/libgimp/tmpl/gimpselection.sgml b/devel-docs/libgimp/tmpl/gimpselection.sgml
index d5016f8af9..68b53adb8b 100644
--- a/devel-docs/libgimp/tmpl/gimpselection.sgml
+++ b/devel-docs/libgimp/tmpl/gimpselection.sgml
@@ -40,9 +40,9 @@ gimpselection
 @y1: 
 @x2: 
 @y2: 
+@Returns: 
 <!-- # Unused Parameters # -->
 @none_empty: 
-@Returns: 
 
 
 <!-- ##### FUNCTION gimp_selection_is_empty ##### -->
@@ -60,5 +60,6 @@ gimpselection
 </para>
 
 @image_ID: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimptexttool.sgml b/devel-docs/libgimp/tmpl/gimptexttool.sgml
index de12cc200a..5470cc5ae5 100644
--- a/devel-docs/libgimp/tmpl/gimptexttool.sgml
+++ b/devel-docs/libgimp/tmpl/gimptexttool.sgml
@@ -45,6 +45,7 @@ gimptexttool
 @height: 
 @ascent: 
 @descent: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_text ##### -->
@@ -92,5 +93,6 @@ gimptexttool
 @height: 
 @ascent: 
 @descent: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimptools.sgml b/devel-docs/libgimp/tmpl/gimptools.sgml
index ec7b694dc4..c903e76c62 100644
--- a/devel-docs/libgimp/tmpl/gimptools.sgml
+++ b/devel-docs/libgimp/tmpl/gimptools.sgml
@@ -23,6 +23,7 @@ gimptools
 @pressure: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_airbrush_default ##### -->
@@ -33,6 +34,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_blend ##### -->
@@ -54,6 +56,7 @@ gimptools
 @y1: 
 @x2: 
 @y2: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_bucket_fill ##### -->
@@ -69,6 +72,7 @@ gimptools
 @sample_merged: 
 @x: 
 @y: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_by_color_select ##### -->
@@ -86,6 +90,7 @@ gimptools
 @feather: 
 @feather_radius: 
 @sample_merged: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_clone ##### -->
@@ -100,6 +105,7 @@ gimptools
 @src_y: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_clone_default ##### -->
@@ -110,6 +116,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_color_picker ##### -->
@@ -128,6 +135,7 @@ gimptools
 @red: 
 @green: 
 @blue: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_convolve ##### -->
@@ -140,6 +148,7 @@ gimptools
 @convolve_type: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_convolve_default ##### -->
@@ -150,6 +159,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_crop ##### -->
@@ -162,6 +172,7 @@ gimptools
 @new_height: 
 @offx: 
 @offy: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_dodgeburn ##### -->
@@ -175,6 +186,7 @@ gimptools
 @dodgeburn_mode: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_dodgeburn_default ##### -->
@@ -185,6 +197,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_ellipse_select ##### -->
@@ -201,6 +214,7 @@ gimptools
 @antialias: 
 @feather: 
 @feather_radius: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_eraser ##### -->
@@ -213,6 +227,7 @@ gimptools
 @strokes: 
 @hardness: 
 @method: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_eraser_default ##### -->
@@ -223,6 +238,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_flip ##### -->
@@ -247,6 +263,7 @@ gimptools
 @antialias: 
 @feather: 
 @feather_radius: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_fuzzy_select ##### -->
@@ -263,6 +280,7 @@ gimptools
 @feather: 
 @feather_radius: 
 @sample_merged: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_paintbrush ##### -->
@@ -276,6 +294,7 @@ gimptools
 @strokes: 
 @method: 
 @gradient_length: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_paintbrush_default ##### -->
@@ -286,6 +305,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_pencil ##### -->
@@ -296,6 +316,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_perspective ##### -->
@@ -329,6 +350,7 @@ gimptools
 @operation: 
 @feather: 
 @feather_radius: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_rotate ##### -->
@@ -377,6 +399,7 @@ gimptools
 @pressure: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_smudge_default ##### -->
@@ -387,6 +410,7 @@ gimptools
 @drawable_ID: 
 @num_strokes: 
 @strokes: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_transform_2d ##### -->
diff --git a/devel-docs/libgimp/tmpl/gimpundo.sgml b/devel-docs/libgimp/tmpl/gimpundo.sgml
index 0f4c5c4e02..eb16c1685f 100644
--- a/devel-docs/libgimp/tmpl/gimpundo.sgml
+++ b/devel-docs/libgimp/tmpl/gimpundo.sgml
@@ -20,6 +20,7 @@ gimpundo
 </para>
 
 @image_ID: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gimp_undo_push_group_end ##### -->
@@ -28,5 +29,6 @@ gimpundo
 </para>
 
 @image_ID: 
+@Returns: 
 
 
diff --git a/devel-docs/libgimp/tmpl/gimputils.sgml b/devel-docs/libgimp/tmpl/gimputils.sgml
index 78be40e23f..8688e1f1b6 100644
--- a/devel-docs/libgimp/tmpl/gimputils.sgml
+++ b/devel-docs/libgimp/tmpl/gimputils.sgml
@@ -26,3 +26,12 @@ g_strescape()
 @Returns: 
 
 
+<!-- ##### FUNCTION gimp_strcompress ##### -->
+<para>
+
+</para>
+
+@source: 
+@Returns: 
+
+
diff --git a/devel-docs/libgimp/tmpl/libgimp-unused.sgml b/devel-docs/libgimp/tmpl/libgimp-unused.sgml
index e69de29bb2..a15efa1e58 100644
--- a/devel-docs/libgimp/tmpl/libgimp-unused.sgml
+++ b/devel-docs/libgimp/tmpl/libgimp-unused.sgml
@@ -0,0 +1,21 @@
+<!-- ##### FUNCTION gimp_request_wakeups ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION set_gimp_PLUG_IN_INFO_PTR ##### -->
+<para>
+
+</para>
+
+@Param1: 
+
+<!-- ##### FUNCTION gp_request_wakeups_write ##### -->
+<para>
+
+</para>
+
+@channel: 
+@Returns: 
+