diff --git a/ChangeLog b/ChangeLog
index e8951d14a7..03efac6e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Tue Aug 22 00:41:06 CEST 2000 Daniel egger  <egger@suse.de>
+Tue Aug 22 01:02:41 CEST 2000 Daniel Egger  <egger@suse.de>
+	
+	* plugins/AlienMap/AlienMap.c: removed COMPAT_CRUFT. 
+
+Tue Aug 22 00:41:06 CEST 2000 Daniel Egger  <egger@suse.de>
 
 	* plugins/dbbrowser/*.c: removed COMPAT_CRUFT and added
 	missing include.
diff --git a/libgimp/gimpprocbrowserdialog.c b/libgimp/gimpprocbrowserdialog.c
index 97fe5cbc52..be27ab652f 100644
--- a/libgimp/gimpprocbrowserdialog.c
+++ b/libgimp/gimpprocbrowserdialog.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -653,9 +654,9 @@ dialog_search_callback (GtkWidget *widget,
 	  query_text++;
 	}
 
-      gimp_query_database (query->str,
-			   ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (query->str,
+			        ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
 
       g_string_free (query, TRUE);
     }
@@ -663,17 +664,18 @@ dialog_search_callback (GtkWidget *widget,
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (by blurb - please wait)"));
-      gimp_query_database (".*", 
-			   gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ),
-			   ".*", ".*", ".*", ".*", ".*",
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", 
+			        gtk_entry_get_text(
+				  GTK_ENTRY(dbbrowser->search_entry) ),
+			        ".*", ".*", ".*", ".*", ".*",
+			        &num_procs, &proc_list);
     }
   else
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (please wait)"));
-      gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
     }
 
   for (i = 0; i < num_procs; i++)
diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c
index 97fe5cbc52..be27ab652f 100644
--- a/libgimp/gimpprocview.c
+++ b/libgimp/gimpprocview.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -653,9 +654,9 @@ dialog_search_callback (GtkWidget *widget,
 	  query_text++;
 	}
 
-      gimp_query_database (query->str,
-			   ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (query->str,
+			        ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
 
       g_string_free (query, TRUE);
     }
@@ -663,17 +664,18 @@ dialog_search_callback (GtkWidget *widget,
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (by blurb - please wait)"));
-      gimp_query_database (".*", 
-			   gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ),
-			   ".*", ".*", ".*", ".*", ".*",
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", 
+			        gtk_entry_get_text(
+				  GTK_ENTRY(dbbrowser->search_entry) ),
+			        ".*", ".*", ".*", ".*", ".*",
+			        &num_procs, &proc_list);
     }
   else
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (please wait)"));
-      gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
     }
 
   for (i = 0; i < num_procs; i++)
diff --git a/plug-ins/AlienMap/AlienMap.c b/plug-ins/AlienMap/AlienMap.c
index 72df06fc33..bc80919bd0 100644
--- a/plug-ins/AlienMap/AlienMap.c
+++ b/plug-ins/AlienMap/AlienMap.c
@@ -78,13 +78,13 @@ typedef struct
 /* Declare local functions. */
 
 static void      query  (void);
-static void      run    (char      *name,
-        		 int        nparams,
-        		 GParam    *param,
-        		 int       *nreturn_vals,
-        		 GParam   **return_vals);
+static void      run    (char         *name,
+        		 int           nparams,
+        		 GimpParam    *param,
+        		 int          *nreturn_vals,
+        		 GimpParam   **return_vals);
 
-static void      alienmap 	     (GDrawable  *drawable);
+static void      alienmap 	     (GimpDrawable  *drawable);
 static void      alienmap_render_row (const guchar *src_row,
 				      guchar *dest_row,
 				      gint row,
@@ -110,7 +110,7 @@ static void      alienmap_logo_dialog   (void);
 GtkWidget   *maindlg;
 GtkWidget   *logodlg;
 
-GPlugInInfo PLUG_IN_INFO =
+GimpPlugInInfo PLUG_IN_INFO =
 {
   NULL,  /* init_proc  */
   NULL,  /* quit_proc  */
@@ -136,15 +136,15 @@ static alienmap_vals_t wvals =
   SINUS,
 };
 
-static GDrawable *drawable;
-static gint       tile_width, tile_height;
-static gint       img_width, img_height, img_bpp;
-static gint       sel_x1, sel_y1, sel_x2, sel_y2;
-static gint       sel_width, sel_height;
-static gint       preview_width, preview_height;
-static GTile     *the_tile = NULL;
-static gdouble    cen_x, cen_y;
-static gdouble    scale_x, scale_y;
+static GimpDrawable *drawable;
+static gint          tile_width, tile_height;
+static gint          img_width, img_height, img_bpp;
+static gint          sel_x1, sel_y1, sel_x2, sel_y2;
+static gint          sel_width, sel_height;
+static gint          preview_width, preview_height;
+static GimpTile     *the_tile = NULL;
+static gdouble       cen_x, cen_y;
+static gdouble       scale_x, scale_y;
 
 /***** Functions *****/
 
@@ -153,7 +153,7 @@ MAIN ()
 static void
 query (void)
 {
-  static GParamDef args[] =
+  static GimpParamDef args[] =
   {
     { PARAM_INT32,    "run_mode",     "Interactive, non-interactive" },
     { PARAM_IMAGE,    "image",        "Input image" },
@@ -165,7 +165,7 @@ query (void)
     { PARAM_INT8,    "greenmode",    "Green application mode (0:SIN;1:COS;2:NONE)" },
     { PARAM_INT8,    "bluemode",     "Blue application mode (0:SIN;1:COS;2:NONE)" },
   };
-  static GParamDef *return_vals = NULL;
+  static GimpParamDef *return_vals = NULL;
   static int nargs = sizeof (args) / sizeof (args[0]);
   static int nreturn_vals = 0;
 
@@ -255,19 +255,19 @@ transform (short int *r,
 
 
 static void
-run (char    *name,
-     int      nparams,
-     GParam  *param,
-     int     *nreturn_vals,
-     GParam **return_vals)
+run (char       *name,
+     int         nparams,
+     GimpParam  *param,
+     int        *nreturn_vals,
+     GimpParam  **return_vals)
 {
-  static GParam values[1];
+  static GimpParam values[1];
 /*   GDrawable *drawable; */
 /*   gint32 image_ID; */
-  GRunModeType  run_mode;
+  GimpRunModeType  run_mode;
   double        xhsiz, yhsiz;
   int   	pwidth, pheight;
-  GStatusType status = STATUS_SUCCESS;
+  GStatusType   status = STATUS_SUCCESS;
  
   INIT_I18N_UI ();
 
@@ -482,9 +482,9 @@ alienmap_render_row (const guchar *src_row,
 }
 
 static void
-alienmap (GDrawable *drawable)
+alienmap (GimpDrawable *drawable)
 {
-  GPixelRgn srcPR, destPR;
+  GimpPixelRgn srcPR, destPR;
   gint width, height;
   gint bytes;
   guchar *src_row;
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index 457d407eca..21f84515c4 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -55,13 +55,13 @@
 
 
 static void   query (void);
-static void   run   (gchar   *name,
-		     gint     nparams,
-		     GParam  *param,
-		     gint    *nreturn_vals,
-		     GParam **return_vals);
+static void   run   (gchar     *name,
+		     gint      nparams,
+		     GimpParam *param,
+		     gint      *nreturn_vals,
+		     GimpParam **return_vals);
 
-GPlugInInfo PLUG_IN_INFO =
+GimpPlugInInfo PLUG_IN_INFO =
 {
   NULL,  /* init_proc  */
   NULL,  /* quit_proc  */
@@ -75,7 +75,7 @@ MAIN ()
 static void
 query (void)
 {
-  static GParamDef args[] =
+  static GimpParamDef args[] =
   {
     { PARAM_INT32, "run_mode", "Interactive, [non-interactive]" }
   };
@@ -95,13 +95,13 @@ query (void)
 }
 
 static void
-run (gchar   *name,
-     gint     nparams,
-     GParam  *param,
-     gint    *nreturn_vals,
-     GParam **return_vals)
+run (gchar      *name,
+     gint       nparams,
+     GimpParam  *param,
+     gint       *nreturn_vals,
+     GimpParam  **return_vals)
 {
-  static GParam values[1];
+  static GimpParam values[1];
   GRunModeType run_mode;
 
   run_mode = param[0].data.d_int32;
diff --git a/plug-ins/dbbrowser/dbbrowser.c b/plug-ins/dbbrowser/dbbrowser.c
index 457d407eca..21f84515c4 100644
--- a/plug-ins/dbbrowser/dbbrowser.c
+++ b/plug-ins/dbbrowser/dbbrowser.c
@@ -55,13 +55,13 @@
 
 
 static void   query (void);
-static void   run   (gchar   *name,
-		     gint     nparams,
-		     GParam  *param,
-		     gint    *nreturn_vals,
-		     GParam **return_vals);
+static void   run   (gchar     *name,
+		     gint      nparams,
+		     GimpParam *param,
+		     gint      *nreturn_vals,
+		     GimpParam **return_vals);
 
-GPlugInInfo PLUG_IN_INFO =
+GimpPlugInInfo PLUG_IN_INFO =
 {
   NULL,  /* init_proc  */
   NULL,  /* quit_proc  */
@@ -75,7 +75,7 @@ MAIN ()
 static void
 query (void)
 {
-  static GParamDef args[] =
+  static GimpParamDef args[] =
   {
     { PARAM_INT32, "run_mode", "Interactive, [non-interactive]" }
   };
@@ -95,13 +95,13 @@ query (void)
 }
 
 static void
-run (gchar   *name,
-     gint     nparams,
-     GParam  *param,
-     gint    *nreturn_vals,
-     GParam **return_vals)
+run (gchar      *name,
+     gint       nparams,
+     GimpParam  *param,
+     gint       *nreturn_vals,
+     GimpParam  **return_vals)
 {
-  static GParam values[1];
+  static GimpParam values[1];
   GRunModeType run_mode;
 
   run_mode = param[0].data.d_int32;
diff --git a/plug-ins/dbbrowser/dbbrowser_utils.c b/plug-ins/dbbrowser/dbbrowser_utils.c
index 97fe5cbc52..be27ab652f 100644
--- a/plug-ins/dbbrowser/dbbrowser_utils.c
+++ b/plug-ins/dbbrowser/dbbrowser_utils.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -653,9 +654,9 @@ dialog_search_callback (GtkWidget *widget,
 	  query_text++;
 	}
 
-      gimp_query_database (query->str,
-			   ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (query->str,
+			        ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
 
       g_string_free (query, TRUE);
     }
@@ -663,17 +664,18 @@ dialog_search_callback (GtkWidget *widget,
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (by blurb - please wait)"));
-      gimp_query_database (".*", 
-			   gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ),
-			   ".*", ".*", ".*", ".*", ".*",
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", 
+			        gtk_entry_get_text(
+				  GTK_ENTRY(dbbrowser->search_entry) ),
+			        ".*", ".*", ".*", ".*", ".*",
+			        &num_procs, &proc_list);
     }
   else
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (please wait)"));
-      gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
     }
 
   for (i = 0; i < num_procs; i++)
diff --git a/plug-ins/dbbrowser/gimpprocbrowser.c b/plug-ins/dbbrowser/gimpprocbrowser.c
index 97fe5cbc52..be27ab652f 100644
--- a/plug-ins/dbbrowser/gimpprocbrowser.c
+++ b/plug-ins/dbbrowser/gimpprocbrowser.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -653,9 +654,9 @@ dialog_search_callback (GtkWidget *widget,
 	  query_text++;
 	}
 
-      gimp_query_database (query->str,
-			   ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (query->str,
+			        ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
 
       g_string_free (query, TRUE);
     }
@@ -663,17 +664,18 @@ dialog_search_callback (GtkWidget *widget,
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (by blurb - please wait)"));
-      gimp_query_database (".*", 
-			   gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ),
-			   ".*", ".*", ".*", ".*", ".*",
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", 
+			        gtk_entry_get_text(
+				  GTK_ENTRY(dbbrowser->search_entry) ),
+			        ".*", ".*", ".*", ".*", ".*",
+			        &num_procs, &proc_list);
     }
   else
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (please wait)"));
-      gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
     }
 
   for (i = 0; i < num_procs; i++)
diff --git a/plug-ins/dbbrowser/gimpprocview.c b/plug-ins/dbbrowser/gimpprocview.c
index 97fe5cbc52..be27ab652f 100644
--- a/plug-ins/dbbrowser/gimpprocview.c
+++ b/plug-ins/dbbrowser/gimpprocview.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -653,9 +654,9 @@ dialog_search_callback (GtkWidget *widget,
 	  query_text++;
 	}
 
-      gimp_query_database (query->str,
-			   ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (query->str,
+			        ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
 
       g_string_free (query, TRUE);
     }
@@ -663,17 +664,18 @@ dialog_search_callback (GtkWidget *widget,
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (by blurb - please wait)"));
-      gimp_query_database (".*", 
-			   gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ),
-			   ".*", ".*", ".*", ".*", ".*",
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", 
+			        gtk_entry_get_text(
+				  GTK_ENTRY(dbbrowser->search_entry) ),
+			        ".*", ".*", ".*", ".*", ".*",
+			        &num_procs, &proc_list);
     }
   else
     {
       gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), 
 			    _("DB Browser (please wait)"));
-      gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
-			   &num_procs, &proc_list);
+      gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*", 
+			        &num_procs, &proc_list);
     }
 
   for (i = 0; i < num_procs; i++)
diff --git a/plug-ins/dbbrowser/procedure-browser.c b/plug-ins/dbbrowser/procedure-browser.c
index 457d407eca..21f84515c4 100644
--- a/plug-ins/dbbrowser/procedure-browser.c
+++ b/plug-ins/dbbrowser/procedure-browser.c
@@ -55,13 +55,13 @@
 
 
 static void   query (void);
-static void   run   (gchar   *name,
-		     gint     nparams,
-		     GParam  *param,
-		     gint    *nreturn_vals,
-		     GParam **return_vals);
+static void   run   (gchar     *name,
+		     gint      nparams,
+		     GimpParam *param,
+		     gint      *nreturn_vals,
+		     GimpParam **return_vals);
 
-GPlugInInfo PLUG_IN_INFO =
+GimpPlugInInfo PLUG_IN_INFO =
 {
   NULL,  /* init_proc  */
   NULL,  /* quit_proc  */
@@ -75,7 +75,7 @@ MAIN ()
 static void
 query (void)
 {
-  static GParamDef args[] =
+  static GimpParamDef args[] =
   {
     { PARAM_INT32, "run_mode", "Interactive, [non-interactive]" }
   };
@@ -95,13 +95,13 @@ query (void)
 }
 
 static void
-run (gchar   *name,
-     gint     nparams,
-     GParam  *param,
-     gint    *nreturn_vals,
-     GParam **return_vals)
+run (gchar      *name,
+     gint       nparams,
+     GimpParam  *param,
+     gint       *nreturn_vals,
+     GimpParam  **return_vals)
 {
-  static GParam values[1];
+  static GimpParam values[1];
   GRunModeType run_mode;
 
   run_mode = param[0].data.d_int32;