diff --git a/ChangeLog b/ChangeLog
index b3347013ad..4501be5eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-11-05  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/imagemap/*.c: ported fixes from stable branch (mostly 
+	missing includes of config.h),
+
+	* plug-ins/gimpressionist/orientmap.c: removed commented out code
+	that continued to show up when grepping for deprecated GTK+ code.
+
+	* tools/pdbgen/pdb/procedural_db.pdb: removed unneeded inclusion
+	of config.h (it gets added automatically).
+
 2001-11-02  Michael Natterer  <mitch@gimp.org>
 
 	* app/display/gimpdisplayshell-scroll.c: stop synthesizing expose
diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c
index e54f49cf48..dc1c7fa71f 100644
--- a/plug-ins/gimpressionist/orientmap.c
+++ b/plug-ins/gimpressionist/orientmap.c
@@ -693,25 +693,3 @@ void create_orientmap_dialog(void)
   updatevectorprev();
   updateompreviewprev();
 }
-
-/*
-void main(int argc, char **argv)
-{
-  gtk_set_locale ();
-  gtk_init (&argc, &argv);
-  gtk_rc_parse ("./rc");
-
-  if(argc > 1)
-    readdata(argv[1]);
-  else {
-    numvect++;
-    vector[0].x = 0.5;
-    vector[0].y = 0.5;
-    vector[0].dir = 0.0;
-    vector[0].str = 1.0;
-  }
-    
-  create_orientmap_dialog();
-  gtk_main();
-}
-*/
diff --git a/plug-ins/imagemap/imap_about.c b/plug-ins/imagemap/imap_about.c
index 49039dd742..d911ab40d6 100644
--- a/plug-ins/imagemap/imap_about.c
+++ b/plug-ins/imagemap/imap_about.c
@@ -21,8 +21,11 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_about.h"
 #include "imap_default_dialog.h"
+
 #include "libgimp/stdplugins-intl.h"
 
 void
diff --git a/plug-ins/imagemap/imap_cmd_clear.c b/plug-ins/imagemap/imap_cmd_clear.c
index 3746dd5ed4..6fe27d4772 100644
--- a/plug-ins/imagemap/imap_cmd_clear.c
+++ b/plug-ins/imagemap/imap_cmd_clear.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_clear.h"
 #include "imap_cmd_delete.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t clear_command_execute(Command_t *parent);
 static void clear_command_undo(Command_t *parent);
 static void clear_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_copy.c b/plug-ins/imagemap/imap_cmd_copy.c
index 28cba18bb2..6aecea196b 100644
--- a/plug-ins/imagemap/imap_cmd_copy.c
+++ b/plug-ins/imagemap/imap_cmd_copy.c
@@ -21,7 +21,10 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy.h"
+
 #include "libgimp/stdplugins-intl.h"
 
 static CmdExecuteValue_t copy_command_execute(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_copy_object.c b/plug-ins/imagemap/imap_cmd_copy_object.c
index 2d8fe566ec..ae89cd0651 100644
--- a/plug-ins/imagemap/imap_cmd_copy_object.c
+++ b/plug-ins/imagemap/imap_cmd_copy_object.c
@@ -21,7 +21,10 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy_object.h"
+
 #include "libgimp/stdplugins-intl.h"
 
 static void copy_object_command_destruct(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_create.c b/plug-ins/imagemap/imap_cmd_create.c
index eced0b2a41..29c270e2d0 100644
--- a/plug-ins/imagemap/imap_cmd_create.c
+++ b/plug-ins/imagemap/imap_cmd_create.c
@@ -21,8 +21,11 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_create.h"
 #include "libgimp/stdplugins-intl.h"
+
 #include "imap_main.h"
 
 static CmdExecuteValue_t create_command_execute(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_cut.c b/plug-ins/imagemap/imap_cmd_cut.c
index 3807a13220..76019db882 100644
--- a/plug-ins/imagemap/imap_cmd_cut.c
+++ b/plug-ins/imagemap/imap_cmd_cut.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_delete.h"
 #include "imap_cmd_cut.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void cut_command_destruct(Command_t *parent);
 static CmdExecuteValue_t cut_command_execute(Command_t *parent);
 static void cut_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_cut_object.c b/plug-ins/imagemap/imap_cmd_cut_object.c
index 8745edd003..dc2df90f52 100644
--- a/plug-ins/imagemap/imap_cmd_cut_object.c
+++ b/plug-ins/imagemap/imap_cmd_cut_object.c
@@ -21,12 +21,15 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy_object.h"
 #include "imap_cmd_cut_object.h"
 #include "imap_cmd_delete.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t cut_object_command_execute(Command_t *parent);
 static void cut_object_command_undo(Command_t *parent);
 static void cut_object_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_delete.c b/plug-ins/imagemap/imap_cmd_delete.c
index 2bb27149e7..870758bd8c 100644
--- a/plug-ins/imagemap/imap_cmd_delete.c
+++ b/plug-ins/imagemap/imap_cmd_delete.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_delete.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void delete_command_destruct(Command_t *parent);
 static CmdExecuteValue_t delete_command_execute(Command_t *parent);
 static void delete_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_delete_point.c b/plug-ins/imagemap/imap_cmd_delete_point.c
index 3eff23b65f..fc787e31f8 100644
--- a/plug-ins/imagemap/imap_cmd_delete_point.c
+++ b/plug-ins/imagemap/imap_cmd_delete_point.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_delete_point.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_polygon.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t delete_point_command_execute(Command_t *parent);
 static void delete_point_command_undo(Command_t *parent);
 
diff --git a/plug-ins/imagemap/imap_cmd_edit_object.c b/plug-ins/imagemap/imap_cmd_edit_object.c
index 5c71d37d90..eadc2eeb14 100644
--- a/plug-ins/imagemap/imap_cmd_edit_object.c
+++ b/plug-ins/imagemap/imap_cmd_edit_object.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_edit_object.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void edit_object_command_destruct(Command_t *parent);
 static void edit_object_command_undo(Command_t *parent);
 
diff --git a/plug-ins/imagemap/imap_cmd_guides.c b/plug-ins/imagemap/imap_cmd_guides.c
index b36617a85f..40891af3ef 100644
--- a/plug-ins/imagemap/imap_cmd_guides.c
+++ b/plug-ins/imagemap/imap_cmd_guides.c
@@ -21,17 +21,19 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include "config.h"
 #include "imap_cmd_create.h"
 #include "imap_default_dialog.h"
 #include "imap_cmd_guides.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_rectangle.h"
 #include "imap_table.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 typedef struct {
    DefaultDialog_t 	*dialog;
    GtkWidget		*image_dimensions;
diff --git a/plug-ins/imagemap/imap_cmd_insert_point.c b/plug-ins/imagemap/imap_cmd_insert_point.c
index b4fab4118c..41e871ad76 100644
--- a/plug-ins/imagemap/imap_cmd_insert_point.c
+++ b/plug-ins/imagemap/imap_cmd_insert_point.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_insert_point.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_polygon.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t insert_point_command_execute(Command_t *parent);
 static void insert_point_command_undo(Command_t *parent);
 
diff --git a/plug-ins/imagemap/imap_cmd_move.c b/plug-ins/imagemap/imap_cmd_move.c
index d38969fd50..057d061579 100644
--- a/plug-ins/imagemap/imap_cmd_move.c
+++ b/plug-ins/imagemap/imap_cmd_move.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_move.h"
 #include "imap_cmd_object_move.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void move_command_destruct(Command_t *parent);
 static CmdExecuteValue_t move_command_execute(Command_t *parent);
 
diff --git a/plug-ins/imagemap/imap_cmd_move_down.c b/plug-ins/imagemap/imap_cmd_move_down.c
index 71c2ff9724..b0c884277a 100644
--- a/plug-ins/imagemap/imap_cmd_move_down.c
+++ b/plug-ins/imagemap/imap_cmd_move_down.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy.h"
 #include "imap_cmd_object_down.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t move_down_command_execute(Command_t *parent);
 static void move_down_command_undo(Command_t *parent);
 static void move_down_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_move_sash.c b/plug-ins/imagemap/imap_cmd_move_sash.c
index 29c61f221e..e538f20a60 100644
--- a/plug-ins/imagemap/imap_cmd_move_sash.c
+++ b/plug-ins/imagemap/imap_cmd_move_sash.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy.h"
 #include "imap_cmd_edit_object.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 COMMAND_PROTO(move_sash_command);
 
 CommandClass_t move_sash_command_class = {
diff --git a/plug-ins/imagemap/imap_cmd_move_selected.c b/plug-ins/imagemap/imap_cmd_move_selected.c
index 231c239d54..4225be4280 100644
--- a/plug-ins/imagemap/imap_cmd_move_selected.c
+++ b/plug-ins/imagemap/imap_cmd_move_selected.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_move_selected.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t move_selected_command_execute(Command_t *parent);
 static void move_selected_command_undo(Command_t *parent);
 
diff --git a/plug-ins/imagemap/imap_cmd_move_to_front.c b/plug-ins/imagemap/imap_cmd_move_to_front.c
index 9f7abf8778..bda5c45ab2 100644
--- a/plug-ins/imagemap/imap_cmd_move_to_front.c
+++ b/plug-ins/imagemap/imap_cmd_move_to_front.c
@@ -21,11 +21,15 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_create.h"
 #include "imap_cmd_delete.h"
 #include "imap_cmd_move_to_front.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t move_to_front_command_execute(Command_t *parent);
 static void move_to_front_command_undo(Command_t *parent);
 static void move_to_front_command_redo(Command_t *parent);
@@ -47,7 +51,7 @@ move_to_front_command_new(ObjectList_t *list)
 {
    MoveToFrontCommand_t *command = g_new(MoveToFrontCommand_t, 1);
    command->list = list;
-   return command_init(&command->parent, "Move To Front", 
+   return command_init(&command->parent, _("Move To Front"), 
 		       &move_to_front_command_class);
 }
 
diff --git a/plug-ins/imagemap/imap_cmd_move_up.c b/plug-ins/imagemap/imap_cmd_move_up.c
index a47f55ca3e..828d1a0f33 100644
--- a/plug-ins/imagemap/imap_cmd_move_up.c
+++ b/plug-ins/imagemap/imap_cmd_move_up.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_move_up.h"
 #include "imap_cmd_object_up.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t move_up_command_execute(Command_t *parent);
 static void move_up_command_undo(Command_t *parent);
 static void move_up_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_object_down.c b/plug-ins/imagemap/imap_cmd_object_down.c
index e214831e13..88dbbffe8c 100644
--- a/plug-ins/imagemap/imap_cmd_object_down.c
+++ b/plug-ins/imagemap/imap_cmd_object_down.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void object_down_command_destruct(Command_t *parent);
 static CmdExecuteValue_t object_down_command_execute(Command_t *parent);
 static void object_down_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_object_move.c b/plug-ins/imagemap/imap_cmd_object_move.c
index 53161fa3b9..474934b4a8 100644
--- a/plug-ins/imagemap/imap_cmd_object_move.c
+++ b/plug-ins/imagemap/imap_cmd_object_move.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_object_move.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void object_move_command_destruct(Command_t *parent);
 static CmdExecuteValue_t object_move_command_execute(Command_t *parent);
 static void object_move_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_object_up.c b/plug-ins/imagemap/imap_cmd_object_up.c
index 746c7475f0..98792b508a 100644
--- a/plug-ins/imagemap/imap_cmd_object_up.c
+++ b/plug-ins/imagemap/imap_cmd_object_up.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_copy.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void object_up_command_destruct(Command_t *parent);
 static CmdExecuteValue_t object_up_command_execute(Command_t *parent);
 static void object_up_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_paste.c b/plug-ins/imagemap/imap_cmd_paste.c
index 2782ec9554..cb53fda06a 100644
--- a/plug-ins/imagemap/imap_cmd_paste.c
+++ b/plug-ins/imagemap/imap_cmd_paste.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_create.h"
 #include "imap_cmd_paste.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t paste_command_execute(Command_t *parent);
 
 static CommandClass_t paste_command_class = {
diff --git a/plug-ins/imagemap/imap_cmd_select.c b/plug-ins/imagemap/imap_cmd_select.c
index a7a8268def..e696a37b34 100644
--- a/plug-ins/imagemap/imap_cmd_select.c
+++ b/plug-ins/imagemap/imap_cmd_select.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_select.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void select_command_destruct(Command_t *parent);
 static CmdExecuteValue_t select_command_execute(Command_t *parent);
 static void select_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_select_all.c b/plug-ins/imagemap/imap_cmd_select_all.c
index df645daece..964752b80a 100644
--- a/plug-ins/imagemap/imap_cmd_select_all.c
+++ b/plug-ins/imagemap/imap_cmd_select_all.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_select.h"
 #include "imap_cmd_select_all.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t select_all_command_execute(Command_t *parent);
 static void select_all_command_undo(Command_t *parent);
 static void select_all_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_select_next.c b/plug-ins/imagemap/imap_cmd_select_next.c
index 327e95a421..3026830ab5 100644
--- a/plug-ins/imagemap/imap_cmd_select_next.c
+++ b/plug-ins/imagemap/imap_cmd_select_next.c
@@ -21,12 +21,16 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_select.h"
 #include "imap_cmd_select_next.h"
 #include "imap_cmd_unselect.h"
-#include "libgimp/stdplugins-intl.h"
+
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t select_next_command_execute(Command_t *parent);
 static void select_next_command_undo(Command_t *command);
 static void select_next_command_redo(Command_t *command);
diff --git a/plug-ins/imagemap/imap_cmd_select_prev.c b/plug-ins/imagemap/imap_cmd_select_prev.c
index e66c80dc73..5e1733adc9 100644
--- a/plug-ins/imagemap/imap_cmd_select_prev.c
+++ b/plug-ins/imagemap/imap_cmd_select_prev.c
@@ -21,11 +21,15 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_select.h"
 #include "imap_cmd_select_prev.h"
 #include "imap_cmd_unselect.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t select_prev_command_execute(Command_t *parent);
 static void select_prev_command_undo(Command_t *command);
 static void select_prev_command_redo(Command_t *command);
@@ -47,7 +51,7 @@ select_prev_command_new(ObjectList_t *list)
 {
    SelectPrevCommand_t *command = g_new(SelectPrevCommand_t, 1);
    command->list = list;
-   return command_init(&command->parent, "Select Previous", 
+   return command_init(&command->parent, _("Select Previous"), 
 		       &select_prev_command_class);
 }
 
diff --git a/plug-ins/imagemap/imap_cmd_select_region.c b/plug-ins/imagemap/imap_cmd_select_region.c
index c2b82fa27a..7a0d8f7a42 100644
--- a/plug-ins/imagemap/imap_cmd_select_region.c
+++ b/plug-ins/imagemap/imap_cmd_select_region.c
@@ -21,13 +21,16 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_rectangle.h"
 #include "imap_cmd_select.h"
 #include "imap_cmd_select_region.h"
 #include "imap_cmd_unselect_all.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t select_region_command_execute(Command_t *parent);
 static void select_region_command_undo(Command_t *parent);
 static void select_region_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_send_to_back.c b/plug-ins/imagemap/imap_cmd_send_to_back.c
index 345685f271..617ecff9dc 100644
--- a/plug-ins/imagemap/imap_cmd_send_to_back.c
+++ b/plug-ins/imagemap/imap_cmd_send_to_back.c
@@ -21,12 +21,15 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_create.h"
 #include "imap_cmd_delete.h"
 #include "imap_cmd_send_to_back.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static CmdExecuteValue_t send_to_back_command_execute(Command_t *parent);
 static void send_to_back_command_undo(Command_t *parent);
 static void send_to_back_command_redo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_cmd_unselect.c b/plug-ins/imagemap/imap_cmd_unselect.c
index 7c5b569f46..40e7ad6d83 100644
--- a/plug-ins/imagemap/imap_cmd_unselect.c
+++ b/plug-ins/imagemap/imap_cmd_unselect.c
@@ -21,10 +21,13 @@
  *
  */
 
+#include "config.h"
+
 #include "imap_cmd_unselect.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static void unselect_command_destruct(Command_t *parent);
 static CmdExecuteValue_t unselect_command_execute(Command_t *parent);
 static void unselect_command_undo(Command_t *parent);
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index 5bfec23884..703ba63a23 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
+
 #include "config.h"
 
 #include <stdarg.h>
diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c
index ea64122495..c5b4ab0891 100644
--- a/plug-ins/imagemap/imap_menu.c
+++ b/plug-ins/imagemap/imap_menu.c
@@ -21,12 +21,11 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "config.h"
-#include "libgimp/stdplugins-intl.h"
-
 #include "imap_circle.h"
 #include "imap_file.h"
 #include "imap_grid.h"
@@ -41,6 +40,8 @@
 #include "imap_source.h"
 #include "imap_tools.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 static gint _menu_callback_lock;
 static Menu_t _menu;
 
@@ -240,7 +241,8 @@ command_list_changed(Command_t *command, gpointer data)
    /* Set undo entry */
    if (_menu.undo)
       gtk_widget_destroy(_menu.undo);
-   scratch = g_strdup_printf (_("Undo %s"), (command) ? command->name : "");
+   scratch = g_strdup_printf (_("Undo %s"), 
+                              command && command->name ? command->name : "");
    _menu.undo = insert_item_with_label(_menu.edit_menu, 1, scratch,
 				       menu_command, &_menu.cmd_undo);
    g_free (scratch);
@@ -251,7 +253,8 @@ command_list_changed(Command_t *command, gpointer data)
    command = command_list_get_redo_command();
    if (_menu.redo)
       gtk_widget_destroy(_menu.redo);
-   scratch = g_strdup_printf (_("Redo %s"), (command) ? command->name : "");
+   scratch = g_strdup_printf (_("Redo %s"), 
+                              command && command->name ? command->name : "");
    _menu.redo = insert_item_with_label(_menu.edit_menu, 2, scratch,
 				       menu_command, &_menu.cmd_redo);
    g_free (scratch);
diff --git a/plug-ins/imagemap/imap_misc.c b/plug-ins/imagemap/imap_misc.c
index 5291f89d3d..3675fc8fa2 100644
--- a/plug-ins/imagemap/imap_misc.c
+++ b/plug-ins/imagemap/imap_misc.c
@@ -40,7 +40,7 @@ make_toolbar_icon(GtkWidget *toolbar, GtkWidget *window, char **data,
 				       data);
    iconw = gtk_pixmap_new(icon, mask);
    return gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-				  identifier, tooltip, "Private", iconw,
+				  identifier, tooltip, NULL, iconw,
 				  GTK_SIGNAL_FUNC(callback), udata);
 }
 
@@ -63,7 +63,7 @@ make_toolbar_radio_icon(GtkWidget *toolbar, GtkWidget *window,
    iconw = gtk_pixmap_new(icon, mask);
    return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 				     GTK_TOOLBAR_CHILD_RADIOBUTTON, prev,
-				     identifier, tooltip, "Private", iconw,
+				     identifier, tooltip, NULL, iconw,
 				     GTK_SIGNAL_FUNC(callback), udata);
 }
 
@@ -86,7 +86,7 @@ make_toolbar_toggle_icon(GtkWidget *toolbar, GtkWidget *window,
    iconw = gtk_pixmap_new(icon, mask);
    return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 				     GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
-				     identifier, tooltip, "Private", iconw,
+				     identifier, tooltip, NULL, iconw,
 				     GTK_SIGNAL_FUNC(callback), udata);
 }
 
diff --git a/plug-ins/imagemap/imap_polygon.c b/plug-ins/imagemap/imap_polygon.c
index e40187b94e..a3b3299cf2 100644
--- a/plug-ins/imagemap/imap_polygon.c
+++ b/plug-ins/imagemap/imap_polygon.c
@@ -21,19 +21,21 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "config.h"
 #include "imap_cmd_delete_point.h"
 #include "imap_cmd_insert_point.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_misc.h"
 #include "imap_object_popup.h"
 #include "imap_polygon.h"
 #include "imap_table.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #include "polygon.xpm"
 
 #define MAX_POLYGON_POINTS 99
diff --git a/plug-ins/imagemap/imap_preferences.c b/plug-ins/imagemap/imap_preferences.c
index 8917c83bf1..0c3aa1f67b 100644
--- a/plug-ins/imagemap/imap_preferences.c
+++ b/plug-ins/imagemap/imap_preferences.c
@@ -21,14 +21,12 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
-#include "libgimp/gimp.h"
-#include "libgimp/stdplugins-intl.h"
-
 #include "imap_command.h"
 #include "imap_file.h"
 #include "imap_main.h"
@@ -38,6 +36,9 @@
 #include "imap_preferences.h"
 #include "imap_table.h"
 
+#include "libgimp/gimp.h"
+#include "libgimp/stdplugins-intl.h"
+
 static gint
 parse_map_type(void)
 {
diff --git a/plug-ins/imagemap/imap_selection.c b/plug-ins/imagemap/imap_selection.c
index 6ba4f5650e..0722213396 100644
--- a/plug-ins/imagemap/imap_selection.c
+++ b/plug-ins/imagemap/imap_selection.c
@@ -21,19 +21,21 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include "config.h"
 #include "imap_cmd_edit_object.h"
 #include "imap_cmd_select.h"
 #include "imap_cmd_unselect.h"
 #include "imap_cmd_unselect_all.h"
 #include "imap_edit_area_info.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_misc.h"
 #include "imap_selection.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #include "arrow_up.xpm"
 #include "arrow_down.xpm"
 #include "delete.xpm"
diff --git a/plug-ins/imagemap/imap_settings.c b/plug-ins/imagemap/imap_settings.c
index 8f17da087d..7ce82d27bd 100644
--- a/plug-ins/imagemap/imap_settings.c
+++ b/plug-ins/imagemap/imap_settings.c
@@ -22,8 +22,8 @@
  */
 
 #include "config.h"
+
 #include "imap_browse.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_settings.h"
 #include "imap_string.h"
@@ -33,6 +33,8 @@
 #define GTK_ENABLE_BROKEN
 #include <gtk/gtktext.h>
 
+#include "libgimp/stdplugins-intl.h"
+
 static MapFormat_t _map_format = CSIM;
 
 static void
diff --git a/plug-ins/imagemap/imap_source.c b/plug-ins/imagemap/imap_source.c
index 844a147eef..a68f620b28 100644
--- a/plug-ins/imagemap/imap_source.c
+++ b/plug-ins/imagemap/imap_source.c
@@ -21,14 +21,17 @@
  *
  */
 
+#include "config.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "imap_default_dialog.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_main.h"
 #include "imap_source.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 /* FIXME: remove usage of the 'broken' GtkText */
 #define GTK_ENABLE_BROKEN
 #include <gtk/gtktext.h>
diff --git a/plug-ins/imagemap/imap_toolbar.c b/plug-ins/imagemap/imap_toolbar.c
index 1c5ceba620..c15b2e3327 100644
--- a/plug-ins/imagemap/imap_toolbar.c
+++ b/plug-ins/imagemap/imap_toolbar.c
@@ -22,11 +22,13 @@
  */
 
 #include "config.h"
-#include "libgimp/stdplugins-intl.h"
+
 #include "imap_main.h"
 #include "imap_misc.h"
 #include "imap_toolbar.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #include "copy.xpm"
 #include "cut.xpm"
 #include "grid.xpm"
diff --git a/plug-ins/imagemap/imap_tools.c b/plug-ins/imagemap/imap_tools.c
index bd0f8c77ce..e0cf507d40 100644
--- a/plug-ins/imagemap/imap_tools.c
+++ b/plug-ins/imagemap/imap_tools.c
@@ -22,10 +22,10 @@
  */
 
 #include "config.h"
+
 #include "imap_circle.h"
 #include "imap_edit_area_info.h"
 #include "imap_main.h"
-#include "libgimp/stdplugins-intl.h"
 #include "imap_menu.h"
 #include "imap_misc.h"
 #include "imap_polygon.h"
@@ -33,6 +33,8 @@
 #include "imap_rectangle.h"
 #include "imap_tools.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #include "arrow.xpm"
 #include "rectangle.xpm"
 #include "circle.xpm"
@@ -128,26 +130,32 @@ make_tools(GtkWidget *window)
    gtk_container_add(GTK_CONTAINER(handlebox), toolbar);
 
    _tools.arrow = make_toolbar_radio_icon(toolbar, window, NULL, arrow_xpm, 
-					  "Select", _("Select existing area"), 
+					  _("Select"), 
+                                          _("Select existing area"), 
 					  arrow_clicked, NULL);
    _tools.rectangle = make_toolbar_radio_icon(toolbar, window, _tools.arrow, 
-					      rectangle_xpm, "Rectangle", 
+					      rectangle_xpm, 
+                                              _("Rectangle"), 
 					      _("Define Rectangle area"), 
 					      rectangle_clicked, NULL);
    _tools.circle = make_toolbar_radio_icon(toolbar, window, _tools.rectangle, 
-					   circle_xpm, "Circle",
+					   circle_xpm, 
+                                           _("Circle"),
 					   _("Define Circle/Oval area"), 
 					   circle_clicked, NULL);
    _tools.polygon = make_toolbar_radio_icon(toolbar, window, _tools.circle, 
-					    polygon_xpm, "Polygon",
+					    polygon_xpm, 
+                                            _("Polygon"),
 					    _("Define Polygon area"), 
 					    polygon_clicked, NULL);
    gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-   _tools.edit = make_toolbar_icon(toolbar, window, edit_xpm, "Edit",
+   _tools.edit = make_toolbar_icon(toolbar, window, edit_xpm, 
+                                   _("Edit"),
 				   _("Edit selected area info"), tools_command,
 				   &_tools.cmd_edit);
    gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-   _tools.delete = make_toolbar_icon(toolbar, window, delete_xpm, "Delete",
+   _tools.delete = make_toolbar_icon(toolbar, window, delete_xpm, 
+                                     _("Delete"),
 				     _("Delete selected area"), tools_command,
 				     &_tools.cmd_delete);
 
diff --git a/po-plug-ins/ChangeLog b/po-plug-ins/ChangeLog
index 3739534ccd..47e016808b 100644
--- a/po-plug-ins/ChangeLog
+++ b/po-plug-ins/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-05  Sven Neumann  <sven@gimp.org>
+
+	* POTFILES.in: added missing files
+
 2001-10-31  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated the Swedish translation some.
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index c28e4ba18c..d68a85463a 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -207,6 +207,7 @@ plug-ins/imagemap/imap_cmd_move.c
 plug-ins/imagemap/imap_cmd_move_down.c
 plug-ins/imagemap/imap_cmd_move_sash.c
 plug-ins/imagemap/imap_cmd_move_selected.c
+plug-ins/imagemap/imap_cmd_move_to_front.c
 plug-ins/imagemap/imap_cmd_move_up.c
 plug-ins/imagemap/imap_cmd_object_down.c
 plug-ins/imagemap/imap_cmd_object_move.c
@@ -215,6 +216,7 @@ plug-ins/imagemap/imap_cmd_paste.c
 plug-ins/imagemap/imap_cmd_select.c
 plug-ins/imagemap/imap_cmd_select_all.c
 plug-ins/imagemap/imap_cmd_select_next.c
+plug-ins/imagemap/imap_cmd_select_prev.c
 plug-ins/imagemap/imap_cmd_select_region.c
 plug-ins/imagemap/imap_cmd_send_to_back.c
 plug-ins/imagemap/imap_cmd_unselect.c
diff --git a/tools/pdbgen/pdb/procedural_db.pdb b/tools/pdbgen/pdb/procedural_db.pdb
index b200bf4987..8eb4dfed9b 100644
--- a/tools/pdbgen/pdb/procedural_db.pdb
+++ b/tools/pdbgen/pdb/procedural_db.pdb
@@ -394,7 +394,7 @@ CODE
     );
 }
 
-@headers = qw(<string.h> "config.h" "libgimp/gimpintl.h");
+@headers = qw(<string.h> "libgimp/gimpintl.h");
 
 $extra{app}->{decls} = <<'CODE';
 /*  Query structure  */