diff --git a/ChangeLog b/ChangeLog
index 161cb804c6..64dd0e7608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-04  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-scale.c
+	* app/gegl/gimpoperationdesaturate.h
+	* app/tools/gimprectangletool.c
+	* app/widgets/gimpradioaction.h
+	* app/widgets/gimptoggleaction.h: various fixes tpo make gtk-doc
+	happy.
+
 2008-06-04  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpcropoptions.c
diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c
index bb54b9827c..c1bb94725c 100644
--- a/app/display/gimpdisplayshell-scale.c
+++ b/app/display/gimpdisplayshell-scale.c
@@ -564,7 +564,7 @@ gimp_display_shell_scale_shrink_wrap (GimpDisplayShell *shell,
  * gimp_display_shell_scale_resize:
  * @shell:          the #GimpDisplayShell
  * @resize_window:  whether the display window should be resized
- * @redisplay:      whether the display window should be redrawn
+ * @grow_only:      whether shrinking of the window is allowed or not
  *
  * Function commonly called after a change in display scale to make the changes
  * visible to the user. If @resize_window is %TRUE then the display window is
diff --git a/app/gegl/gimpoperationdesaturate.h b/app/gegl/gimpoperationdesaturate.h
index 00de2450de..d741cd39df 100644
--- a/app/gegl/gimpoperationdesaturate.h
+++ b/app/gegl/gimpoperationdesaturate.h
@@ -26,10 +26,12 @@
 #include "gimpoperationpointfilter.h"
 
 
-#define GIMP_TYPE_OPERATION_DESATURATE           (gimp_operation_desaturate_get_type ())
-#define GIMP_OPERATION_DESATURATE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturate))
-#define GIMP_OPERATION_DESATURATE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
-#define GIMP_OPERATION_DESATURATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
+#define GIMP_TYPE_OPERATION_DESATURATE            (gimp_operation_desaturate_get_type ())
+#define GIMP_OPERATION_DESATURATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturate))
+#define GIMP_OPERATION_DESATURATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
+#define GIMP_IS_OPERATION_DESATURATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DESATURATE))
+#define GIMP_IS_OPERATION_DESATURATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DESATURATE))
+#define GIMP_OPERATION_DESATURATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
 
 
 typedef struct _GimpOperationDesaturateClass GimpOperationDesaturateClass;
diff --git a/app/tools/gimprectangletool.c b/app/tools/gimprectangletool.c
index c88467be36..244f2ba625 100644
--- a/app/tools/gimprectangletool.c
+++ b/app/tools/gimprectangletool.c
@@ -4095,8 +4095,8 @@ gimp_rectangle_tool_update_int_rect (GimpRectangleTool *rect_tool)
  * @pub_x2:
  * @pub_y2:
  *
- * Returns the rectangle as it appears to be publicly (based on
- * integer or double precision-mode.
+ * This function returns the rectangle as it appears to be publicly
+ * (based on integer or double precision-mode).
  **/
 static void
 gimp_rectangle_tool_get_public_rect (GimpRectangleTool *rect_tool,
diff --git a/app/widgets/gimpradioaction.h b/app/widgets/gimpradioaction.h
index f0eb020d6f..5c43c799c7 100644
--- a/app/widgets/gimpradioaction.h
+++ b/app/widgets/gimpradioaction.h
@@ -32,8 +32,18 @@
 #define GIMP_RADIO_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
 
 
-typedef GtkRadioAction      GimpRadioAction;
-typedef GtkRadioActionClass GimpRadioActionClass;
+typedef struct _GimpRadioAction      GimpRadioAction;
+typedef struct _GimpRadioActionClass GimpRadioActionClass;
+
+struct _GimpRadioAction
+{
+  GtkRadioAction  parent_instance;
+};
+
+struct _GimpRadioActionClass
+{
+  GtkRadioActionClass  parent_class;
+};
 
 
 GType            gimp_radio_action_get_type (void) G_GNUC_CONST;
diff --git a/app/widgets/gimptoggleaction.h b/app/widgets/gimptoggleaction.h
index 5dfc15b406..4c60aeb07c 100644
--- a/app/widgets/gimptoggleaction.h
+++ b/app/widgets/gimptoggleaction.h
@@ -32,8 +32,18 @@
 #define GIMP_TOGGLE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
 
 
-typedef GtkToggleAction      GimpToggleAction;
-typedef GtkToggleActionClass GimpToggleActionClass;
+typedef struct _GimpToggleAction      GimpToggleAction;
+typedef struct _GimpToggleActionClass GimpToggleActionClass;
+
+struct _GimpToggleAction
+{
+  GtkToggleAction  parent_instance;
+};
+
+struct _GimpToggleActionClass
+{
+  GtkToggleActionClass  parent_class;
+};
 
 
 GType             gimp_toggle_action_get_type (void) G_GNUC_CONST;