diff --git a/ChangeLog b/ChangeLog
index dbc969db9d..2a4110b132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-18  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimphelp-ids.h: define GIMP_HELP_DOCK_SEPARATOR.
+
+	* app/widgets/gimpdock.c
+	* app/widgets/gimpdockable.c: help-ids are never used directly,
+	use the defines from app/widgets/gimphelp-ids.h instead.
+
 2004-08-17  Simon Budig  <simon@gimp.org>
 
 	* modules/colorsel_triangle.c: Made the triangle colorselector
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index b3035b96a2..60d94d0b05 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -38,6 +38,7 @@
 #include "gimpdock.h"
 #include "gimpdockable.h"
 #include "gimpdockbook.h"
+#include "gimphelp-ids.h"
 #include "gimpwidgets-utils.h"
 
 #include "gimp-intl.h"
@@ -427,7 +428,7 @@ gimp_dock_separator_new (GimpDock *dock)
 
   gimp_help_set_help_data (event_box,
                            _("You can drop dockable dialogs here."),
-                             "gimp-dock-separator");
+                           GIMP_HELP_DOCK_SEPARATOR);
 
   gtk_drag_dest_set (GTK_WIDGET (event_box),
                      GTK_DEST_DEFAULT_ALL,
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index 2fba915106..5428d6c878 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -35,6 +35,7 @@
 #include "gimpdockable.h"
 #include "gimpdockbook.h"
 #include "gimpdocked.h"
+#include "gimphelp-ids.h"
 #include "gimpuimanager.h"
 #include "gimpwidgets-utils.h"
 
@@ -210,7 +211,7 @@ gimp_dockable_init (GimpDockable *dockable)
   gtk_widget_show (dockable->close_button);
 
   gimp_help_set_help_data (dockable->close_button, _("Close this Tab"),
-                           "gimp-dockable-close-tab");
+                           GIMP_HELP_DOCK_TAB_CLOSE);
 
   image = gtk_image_new_from_stock (GIMP_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (dockable->close_button), image);
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 4c5aab8c55..8f89de12fe 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -400,6 +400,7 @@
 #define GIMP_HELP_DOCK_VIEW_AS_LIST               "gimp-dock-view-as-list"
 #define GIMP_HELP_DOCK_VIEW_AS_GRID               "gimp-dock-view-as-grid"
 #define GIMP_HELP_DOCK_CHANGE_SCREEN              "gimp-dock-change-screen"
+#define GIMP_HELP_DOCK_SEPARATOR                  "gimp-dock-separator"
 
 #define GIMP_HELP_ABOUT_DIALOG                    "gimp-about-dialog"
 #define GIMP_HELP_COLOR_DIALOG                    "gimp-color-dialog"