diff --git a/plug-ins/AlienMap/AlienMap.c b/plug-ins/AlienMap/AlienMap.c
index c6bf7d49e3395325bddd58ac21b6e1839a204e41..6d89eed9f44dd064bdf272906d94885c1767d637 100644
--- a/plug-ins/AlienMap/AlienMap.c
+++ b/plug-ins/AlienMap/AlienMap.c
@@ -1159,7 +1159,7 @@ alienmap_logo_dialog()
       GTK_WIDGET_SET_FLAGS(xbutton, GTK_CAN_DEFAULT);
       gtk_signal_connect_object (GTK_OBJECT(xbutton), "clicked",
 				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 logodlg);
+				 GTK_OBJECT(logodlg));
       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(logodlg)->action_area),
 			 xbutton, TRUE, TRUE, 0);
       gtk_widget_grab_default(xbutton);
diff --git a/plug-ins/CEL/CEL.c b/plug-ins/CEL/CEL.c
index a832e60467d624314f16e60bde2da8fac709cb01..ec52eeceec8c3264f1b6e824895754f5a665b6e3 100644
--- a/plug-ins/CEL/CEL.c
+++ b/plug-ins/CEL/CEL.c
@@ -157,7 +157,7 @@ static gint32 load_image(char *file, char *brief) {
 
   fread(header, 4, 1, fp);
 
-  if (strncmp(header, "KiSS", 4)) {
+  if (strncmp((char *)header, "KiSS", 4)) {
     colours= 16;
     width= header[0] + (256 * header[1]);
     height= header[2] + (256 * header[3]);
@@ -273,7 +273,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
 
  /* Headers */
   memset(header,(int)0,(size_t)32);
-  strcpy(header, "KiSS");
+  strcpy((char *)header, "KiSS");
   header[4]= 0x20;
 
  /* Work out whether to save as 8bit or 4bit */
diff --git a/plug-ins/CML_explorer/CML_explorer.c b/plug-ins/CML_explorer/CML_explorer.c
index ceb06595e71969e77bb01f696d7f299ce7e755a6..44f82cefb268c750f6baada0d26201edb94fec01 100644
--- a/plug-ins/CML_explorer/CML_explorer.c
+++ b/plug-ins/CML_explorer/CML_explorer.c
@@ -464,7 +464,7 @@ gint		mem_chank1_size = 0;
 guchar		*mem_chank2 = NULL;
 gint		mem_chank2_size = 0;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/align_layers/align_layers.c b/plug-ins/align_layers/align_layers.c
index c7990970994552df7c913e58c7f00729a319dbbe..e72f5ad06e25168da1aca7d1b9563bab1c0af3b7 100644
--- a/plug-ins/align_layers/align_layers.c
+++ b/plug-ins/align_layers/align_layers.c
@@ -200,7 +200,7 @@ static Interface INTERFACE = { FALSE };
 
 /* gint	link_after_alignment = 0;*/
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/animationplay/animationplay.c b/plug-ins/animationplay/animationplay.c
index 21f8b6a6bc3e179424e0d351cc53f684aff47200..923310ec530305dfcab0a55ae2cc8d8c5a291310 100644
--- a/plug-ins/animationplay/animationplay.c
+++ b/plug-ins/animationplay/animationplay.c
@@ -304,7 +304,7 @@ build_dialog(GImageType basetype,
   gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
 		      (GtkSignalFunc) window_close_callback,
-		      dlg);
+		      (GtkObject *)dlg);
 
   
   /* Action area - 'close' button only. */
diff --git a/plug-ins/bmp/bmpwrite.c b/plug-ins/bmp/bmpwrite.c
index 5f0b578da998c7f2bd1bf295873345bbd2024280..9879a22b9b70fdebd01643b5d03f71f5ea644e59 100644
--- a/plug-ins/bmp/bmpwrite.c
+++ b/plug-ins/bmp/bmpwrite.c
@@ -132,7 +132,7 @@ WriteBMP (filename,image,drawable_ID)
   
   /* fetch the image */
   
-  pixels = (guchar *) g_malloc(drawable->width*drawable->height*channels);
+  pixels = (char *) g_malloc(drawable->width*drawable->height*channels);
   gimp_pixel_rgn_get_rect(&pixel_rgn, pixels, 0, 0, drawable->width, drawable->height);
   
   /* And let's begin the progress */
diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c
index a832e60467d624314f16e60bde2da8fac709cb01..ec52eeceec8c3264f1b6e824895754f5a665b6e3 100644
--- a/plug-ins/common/CEL.c
+++ b/plug-ins/common/CEL.c
@@ -157,7 +157,7 @@ static gint32 load_image(char *file, char *brief) {
 
   fread(header, 4, 1, fp);
 
-  if (strncmp(header, "KiSS", 4)) {
+  if (strncmp((char *)header, "KiSS", 4)) {
     colours= 16;
     width= header[0] + (256 * header[1]);
     height= header[2] + (256 * header[3]);
@@ -273,7 +273,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
 
  /* Headers */
   memset(header,(int)0,(size_t)32);
-  strcpy(header, "KiSS");
+  strcpy((char *)header, "KiSS");
   header[4]= 0x20;
 
  /* Work out whether to save as 8bit or 4bit */
diff --git a/plug-ins/common/CML_explorer.c b/plug-ins/common/CML_explorer.c
index ceb06595e71969e77bb01f696d7f299ce7e755a6..44f82cefb268c750f6baada0d26201edb94fec01 100644
--- a/plug-ins/common/CML_explorer.c
+++ b/plug-ins/common/CML_explorer.c
@@ -464,7 +464,7 @@ gint		mem_chank1_size = 0;
 guchar		*mem_chank2 = NULL;
 gint		mem_chank2_size = 0;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/common/align_layers.c b/plug-ins/common/align_layers.c
index c7990970994552df7c913e58c7f00729a319dbbe..e72f5ad06e25168da1aca7d1b9563bab1c0af3b7 100644
--- a/plug-ins/common/align_layers.c
+++ b/plug-ins/common/align_layers.c
@@ -200,7 +200,7 @@ static Interface INTERFACE = { FALSE };
 
 /* gint	link_after_alignment = 0;*/
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c
index 21f8b6a6bc3e179424e0d351cc53f684aff47200..923310ec530305dfcab0a55ae2cc8d8c5a291310 100644
--- a/plug-ins/common/animationplay.c
+++ b/plug-ins/common/animationplay.c
@@ -304,7 +304,7 @@ build_dialog(GImageType basetype,
   gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
 		      (GtkSignalFunc) window_close_callback,
-		      dlg);
+		      (GtkObject *)dlg);
 
   
   /* Action area - 'close' button only. */
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index 697fd7646ccdd37c7672503dae3f0d7fbd254c1e..b96238fa0b4834bf5544f2ba32550d3c5f1d8df7 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -210,7 +210,7 @@ run(gchar *name, gint nparam, GParam *param,
 }
 
 #define pixelScale 255.9
-void
+static void
 EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
        /*
         * compute the light vector from the input parameters.
@@ -250,7 +250,7 @@ EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
  *
  */
 
-void
+static inline void
 EmbossRow(guchar *src, guchar *texture, guchar *dst,
           guint xSize, guint bypp, gint alpha) {
    glong Nx, Ny, NdotL;
diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c
index 0f4a4b291efbd4ff3959b96404d08858457bd58f..ad4b8784cb1cce3d0ace45e1ab846fb83178d232 100644
--- a/plug-ins/common/exchange.c
+++ b/plug-ins/common/exchange.c
@@ -334,7 +334,7 @@ int	doDialog()
 	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 	gtk_signal_connect_object (GTK_OBJECT(button), "clicked",
 				   (GtkSignalFunc) gtk_widget_destroy,
-				   dialog);
+				   GTK_OBJECT(dialog));
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
 	                   button, TRUE, TRUE, 0);
 	gtk_widget_show(button); 
diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c
index 64dbb1e0745cc5e207e7bde03c1cf92f42ed622f..5073a7b490fc6b467dc51b785571c5f5c1f30237 100644
--- a/plug-ins/common/gbr.c
+++ b/plug-ins/common/gbr.c
@@ -253,7 +253,7 @@ static gint32 load_image (char *filename) {
 			g_free(buffer);
 			return -1;
 		}
-		gimp_pixel_rgn_set_row(&pixel_rgn, buffer, 0, line, ph.width);
+		gimp_pixel_rgn_set_row(&pixel_rgn, (guchar *)buffer, 0, line, ph.width);
 		gimp_progress_update((double) line / (double) ph.height);
 	}
 
diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c
index 8df4d2f68c38344864cb281b9774980231cfa7cc..e960c894d15975803f3cfebb9697544f803440b2 100644
--- a/plug-ins/common/gif.c
+++ b/plug-ins/common/gif.c
@@ -841,8 +841,8 @@ DoExtension (FILE *fd,
 	;
       return FALSE;
     default:
-      str = buf;
-      sprintf (buf, "UNKNOWN (0x%02x)", label);
+      str = (char *)buf;
+      sprintf ((char *)buf, "UNKNOWN (0x%02x)", label);
       break;
     }
 
diff --git a/plug-ins/common/gqbist.c b/plug-ins/common/gqbist.c
index 6de8321cebc7c9c68006a6dca1fb6eaac359977d..06b08508388dadbbd31ea1fa7252ef53deb1b089 100644
--- a/plug-ins/common/gqbist.c
+++ b/plug-ins/common/gqbist.c
@@ -374,7 +374,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret
 
 			gimp_progress_init ("Qbist ...");
 			for (row=sel_y1; row<sel_y2; row++) {
-				qbist(qbist_info, row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
+				qbist(qbist_info, (guchar *)row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
 				gimp_pixel_rgn_set_row(&imagePR, row_data, sel_x1, row, (sel_x2-sel_x1));
 				if ((row % 5) == 0) 
 					gimp_progress_update((gfloat)(row-sel_y1)/(gfloat)(sel_y2-sel_y1));
@@ -430,7 +430,7 @@ void dialog_update_previews(GtkWidget *widget, gpointer data)
 	for (j=0;j<9;j++) {
 		optimize(info[(j+5) % 9]);
 		for (i = 0; i < PREVIEW_SIZE; i++) {
-			qbist(info[(j+5) % 9], buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
+			qbist(info[(j+5) % 9], (gchar *)buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
 			gtk_preview_draw_row (GTK_PREVIEW (preview[j]), buf, 0, i, PREVIEW_SIZE);
 		}
 		gtk_widget_draw(preview[j], NULL);
diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c
index dc49b187db0c079be71a83ab46b81733a7f339ec..5602f6e73f32ae95e95fbb757d98cd9d3d7e668d 100644
--- a/plug-ins/common/hot.c
+++ b/plug-ins/common/hot.c
@@ -569,7 +569,7 @@ pluginCoreIA(struct piArgs *argp) {
  * 0 to 1, the signal goes from the pedestal level to 100 IRE.
  * Chroma is always scaled to remain consistent with Y.
  */
-void
+static void
 build_tab(int m) {
   register double f;
   register int pv;
@@ -596,7 +596,7 @@ build_tab(int m) {
   icompos_lim = (int)(compos_lim * SCALE + 0.5);
 }
 
-int
+static int
 hotp(register guint8 r, register guint8 g, register guint8 b) {
   register int	y, i, q;
   register long	y2, c2;
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index 0b277519668d61091bf5dd9f0c603d5ce9c0909a..57c683258b3aace72a59e691108e548d675780e2 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -215,7 +215,7 @@ static int frame_number;
 static int layer_alpha;
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -592,7 +592,7 @@ iwarp_layer_copy(gint32 layerID)
                                   
 
 
-void iwarp()
+static void iwarp()
 {
  int i;
  gint32 layerID;
diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c
index ecff99e220879af8084a20f1b6e5afda40b589d1..4aa979e1138d0468de73ec97a319748dea3af24a 100644
--- a/plug-ins/common/max_rgb.c
+++ b/plug-ins/common/max_rgb.c
@@ -110,7 +110,7 @@ static Interface INTERFACE = { FALSE };
 gint	hold_max;
 gint	hold_min;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -169,7 +169,7 @@ run (char	*name,
       /* Since a channel might be selected, we must check wheter RGB or not. */
       if (!gimp_drawable_color(drawable_id))
 	{
-	  ERROR_DIALOG (1, "RGB drawable is not selected.");
+	  ERROR_DIALOG (1, (guchar *)"RGB drawable is not selected.");
 	  return;
 	}
       if (! DIALOG ())
diff --git a/plug-ins/common/mpeg.c b/plug-ins/common/mpeg.c
index a0697c54da230a867a4e61dec326ce7d84c04e9e..7dd57ff9f8a7a7d6d89d116ba758acb51a7ed955 100644
--- a/plug-ins/common/mpeg.c
+++ b/plug-ins/common/mpeg.c
@@ -276,7 +276,7 @@ load_image (char *filename)
 	 plugin.
 
 	 */
-      moreframes = GetMPEGFrame(data);
+      moreframes = GetMPEGFrame((char *)data);
       if (!moreframes) break;
 
       if (delay > 0)
diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c
index 7774a76651d1664721bb2c1ee669be93ecbb9259..768aabf60a14f078a8a9b005ef1df5683ca80fa5 100644
--- a/plug-ins/common/nlfilt.c
+++ b/plug-ins/common/nlfilt.c
@@ -471,7 +471,7 @@ gint noisevariance;      /* global so that pixel processing code can get at it q
 #define RUNSCALE(x) (((x) + (1 << (SCALEB-1))) >> SCALEB)       /* rounded un-scale */
 #define UNSCALE(x) ((x) >> SCALEB)
 
-void
+static void
 nlfiltRow(guchar *src, guchar *dst, gint width, gint Bpp, gint filtno) {
    gint x, po, no;
    gint pf[9];
@@ -524,7 +524,7 @@ gint AVEDIV[7 * NOCSVAL];              /* divide by 7 to give average value */
 gint SQUARE[2 * NOCSVAL];              /* scaled square lookup table */
 
 /* Table initialisation function - return alpha range */
-gint
+static inline gint
 nlfiltInit(gdouble alpha, gdouble radius, FilterType filter) {
    gint alpharange;                 /* alpha range value 0 - 3 */
    gdouble meanscale;               /* scale for finding mean */
diff --git a/plug-ins/common/pcx.c b/plug-ins/common/pcx.c
index ea1740061994ce301a65ec6327df62929deafcf7..fcc5f0782e4eab2293c5443ef2800c1b80cc7779 100644
--- a/plug-ins/common/pcx.c
+++ b/plug-ins/common/pcx.c
@@ -366,7 +366,7 @@ static void readline(FILE *fp, guchar *buffer, int bytes) {
   }
 }
 
-gint save_image (char *filename, gint32 image, gint32 layer) {
+static gint save_image (char *filename, gint32 image, gint32 layer) {
   FILE *fp;
   GPixelRgn pixel_rgn;
   GDrawable *drawable;
diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c
index 880a3b32eb020cda4e3c9a7a9fc855f2be09100d..14bb1050cec807d15c2e28cac4d3eb6b3600e5f1 100644
--- a/plug-ins/common/plasma.c
+++ b/plug-ins/common/plasma.c
@@ -309,8 +309,8 @@ plasma_dialog()
   entry = gtk_entry_new ();
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0 );
   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
-  sprintf( buffer, "%d", pvals.seed );
-  gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+  sprintf( (char *)buffer, "%d", pvals.seed );
+  gtk_entry_set_text (GTK_ENTRY (entry), (gchar *)buffer );
   gtk_signal_connect (GTK_OBJECT (entry), "changed",
 		      (GtkSignalFunc) plasma_entry_callback,
 		      &pvals.seed);
diff --git a/plug-ins/common/pnm.c b/plug-ins/common/pnm.c
index 556b94fd012418ec4ff979be3f17036433ac5dbe..3028b895d0a3efdbd568752d5ec5428f1e88763a 100644
--- a/plug-ins/common/pnm.c
+++ b/plug-ins/common/pnm.c
@@ -457,7 +457,7 @@ load_image (char *filename)
 }
 
 
-void
+static void
 pnm_load_ascii (PNMScanner *scan,
 		PNMInfo    *info,
 		GPixelRgn  *pixel_rgn)
@@ -517,7 +517,7 @@ pnm_load_ascii (PNMScanner *scan,
   g_free (data);
 }
 
-void
+static void
 pnm_load_raw (PNMScanner *scan,
 	      PNMInfo    *info,
 	      GPixelRgn  *pixel_rgn)
@@ -564,7 +564,7 @@ pnm_load_raw (PNMScanner *scan,
 }
 
 void
-pnm_load_rawpbm (PNMScanner *scan,
+static pnm_load_rawpbm (PNMScanner *scan,
 		 PNMInfo    *info,
 		 GPixelRgn  *pixel_rgn)
 {
@@ -936,7 +936,7 @@ save_dialog ()
  *    Creates a new scanner based on a file descriptor.  The
  *    look ahead buffer is one character initially.
  */
-PNMScanner *
+static PNMScanner *
 pnmscanner_create (int fd)
 {
   PNMScanner *s;
@@ -952,7 +952,7 @@ pnmscanner_create (int fd)
 /* pnmscanner_destroy ---
  *    Destroys a scanner and its resources.  Doesn't close the fd.
  */
-void
+static void
 pnmscanner_destroy (PNMScanner *s)
 {
   if (s->inbuf) g_free(s->inbuf);
@@ -962,7 +962,7 @@ pnmscanner_destroy (PNMScanner *s)
 /* pnmscanner_createbuffer ---
  *    Creates a buffer so we can do buffered reads.
  */
-void
+static void
 pnmscanner_createbuffer (PNMScanner *s,
 			 int         bufsize)
 {
@@ -975,7 +975,7 @@ pnmscanner_createbuffer (PNMScanner *s,
 /* pnmscanner_gettoken ---
  *    Gets the next token, eating any leading whitespace.
  */
-void
+static void
 pnmscanner_gettoken (PNMScanner *s,
 		     char       *buf,
 		     int         bufsize)
@@ -994,7 +994,7 @@ pnmscanner_gettoken (PNMScanner *s,
 /* pnmscanner_getchar ---
  *    Reads a character from the input stream
  */
-void
+static void
 pnmscanner_getchar (PNMScanner *s)
 {
   if (s->inbuf)
@@ -1017,7 +1017,7 @@ pnmscanner_getchar (PNMScanner *s)
  *    Eats up whitespace from the input and returns when done or eof.
  *    Also deals with comments.
  */
-void
+static void
 pnmscanner_eatwhitespace (PNMScanner *s)
 {
   int state = 0;
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index 758747601f1df1549448984343632e6ec95b9da1..183ac12e5b00a2bb8db7d339f6b51fe080f34e7f 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
 };
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/common/scatter_hsv.c b/plug-ins/common/scatter_hsv.c
index 4a27b97da4c1ffdfcdc1c4dd39c0866f3a570091..49c9f53c3509a9684b44a40ed5d17e9326b94e26 100644
--- a/plug-ins/common/scatter_hsv.c
+++ b/plug-ins/common/scatter_hsv.c
@@ -144,7 +144,7 @@ gint	preview_dragging = FALSE;
 gint	preview_drag_start_x = 0;
 gint	preview_drag_start_y = 0;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -202,7 +202,7 @@ run (char	*name,
       gimp_get_data (PLUG_IN_NAME, &VALS);
       if (!gimp_drawable_color(drawable_id))
 	{
-	  scatter_hsv_error_dialog (1, "RGB drawable is not selected.");
+	  scatter_hsv_error_dialog (1, (guchar *)"RGB drawable is not selected.");
 	  return;
 	}
       if (! DIALOG ())
@@ -627,7 +627,7 @@ ERROR_DIALOG (gint gtk_was_not_initialized, guchar *message)
   gtk_container_border_width (GTK_CONTAINER (table), 10);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
 
-  label = gtk_label_new (message);
+  label = gtk_label_new ((char *)message);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND,
 		    0, 0, 0);
 
diff --git a/plug-ins/common/tga.c b/plug-ins/common/tga.c
index 915c2e4d303f3a3bf38301270eceeef6834752cc..513c4f357bc086596c4ca0d67de17c199c56e0a0 100644
--- a/plug-ins/common/tga.c
+++ b/plug-ins/common/tga.c
@@ -188,7 +188,7 @@ GPlugInInfo PLUG_IN_INFO =
 };
 
 
-MAIN ();
+MAIN ()
 
 #ifdef VERBOSE
 static int verbose = VERBOSE;
@@ -1101,7 +1101,7 @@ ReadImage (FILE *fp, struct tga_header *hdr, char *filename)
 }  /*read_image*/
 
 
-gint
+static gint
 save_image (char   *filename,
 	    gint32  image_ID,
 	    gint32  drawable_ID)
@@ -1127,8 +1127,8 @@ save_image (char   *filename,
   height = drawable->height;
 
   name_buf = (guchar *) g_malloc(strlen(filename) + 11);
-  sprintf(name_buf, "Saving %s:", filename);
-  gimp_progress_init(name_buf);
+  sprintf((char *)name_buf, "Saving %s:", filename);
+  gimp_progress_init((char *)name_buf);
   g_free(name_buf);
 
   memset (&hdr, 0, sizeof (hdr));
diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c
index 90f06e72f896d621d1f0cbde60369887a4e0cb51..07700b5a49cb06a96a4c0d04f970caad6d1b2fa0 100644
--- a/plug-ins/common/tileit.c
+++ b/plug-ins/common/tileit.c
@@ -140,7 +140,7 @@ static TileItVals itvals =
 typedef enum {
   ALL,
   ALT,
-  EXPLICT,
+  EXPLICT
 } AppliedTo;
 
 typedef struct {
diff --git a/plug-ins/common/vpropagate.c b/plug-ins/common/vpropagate.c
index ca6868b269dd518af451d3501e5927855fc57d63..3242c06bfed2dab75e6b8b4ceeebd7ed1fa4436b 100644
--- a/plug-ins/common/vpropagate.c
+++ b/plug-ins/common/vpropagate.c
@@ -225,7 +225,7 @@ typedef struct
 static VPInterface vpropagate_interface = { FALSE };
 gint	drawable_id;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c
index 42b3b2107169d8d2d03b1f2e38f08e4ab3913029..1f663166ff21b6b929ad74f637ac90e8a157daa5 100644
--- a/plug-ins/common/xpm.c
+++ b/plug-ins/common/xpm.c
@@ -133,7 +133,7 @@ static XpmSaveInterface xpmint =
 
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/dbbrowser/dbbrowser.c b/plug-ins/dbbrowser/dbbrowser.c
index 758747601f1df1549448984343632e6ec95b9da1..183ac12e5b00a2bb8db7d339f6b51fe080f34e7f 100644
--- a/plug-ins/dbbrowser/dbbrowser.c
+++ b/plug-ins/dbbrowser/dbbrowser.c
@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
 };
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/dbbrowser/procedure-browser.c b/plug-ins/dbbrowser/procedure-browser.c
index 758747601f1df1549448984343632e6ec95b9da1..183ac12e5b00a2bb8db7d339f6b51fe080f34e7f 100644
--- a/plug-ins/dbbrowser/procedure-browser.c
+++ b/plug-ins/dbbrowser/procedure-browser.c
@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
 };
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/emboss/emboss.c b/plug-ins/emboss/emboss.c
index 697fd7646ccdd37c7672503dae3f0d7fbd254c1e..b96238fa0b4834bf5544f2ba32550d3c5f1d8df7 100644
--- a/plug-ins/emboss/emboss.c
+++ b/plug-ins/emboss/emboss.c
@@ -210,7 +210,7 @@ run(gchar *name, gint nparam, GParam *param,
 }
 
 #define pixelScale 255.9
-void
+static void
 EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
        /*
         * compute the light vector from the input parameters.
@@ -250,7 +250,7 @@ EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
  *
  */
 
-void
+static inline void
 EmbossRow(guchar *src, guchar *texture, guchar *dst,
           guint xSize, guint bypp, gint alpha) {
    glong Nx, Ny, NdotL;
diff --git a/plug-ins/exchange/exchange.c b/plug-ins/exchange/exchange.c
index 0f4a4b291efbd4ff3959b96404d08858457bd58f..ad4b8784cb1cce3d0ace45e1ab846fb83178d232 100644
--- a/plug-ins/exchange/exchange.c
+++ b/plug-ins/exchange/exchange.c
@@ -334,7 +334,7 @@ int	doDialog()
 	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 	gtk_signal_connect_object (GTK_OBJECT(button), "clicked",
 				   (GtkSignalFunc) gtk_widget_destroy,
-				   dialog);
+				   GTK_OBJECT(dialog));
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
 	                   button, TRUE, TRUE, 0);
 	gtk_widget_show(button); 
diff --git a/plug-ins/faxg3/faxg3.c b/plug-ins/faxg3/faxg3.c
index a3dd7b56755da3ea9844dac3531eeab14316b459..c9d93f5c20d8fec958fae061e7672131d52d0844 100644
--- a/plug-ins/faxg3/faxg3.c
+++ b/plug-ins/faxg3/faxg3.c
@@ -35,7 +35,7 @@
 /* Declare local functions.
  */
 gint32        emitgimp   (int, int, char *, int, char *);
-static void   query      (void);
+void   query      (void);
 static void   run        (char    *name,
 			  int      nparams,
 			  GParam  *param,
@@ -53,7 +53,7 @@ GPlugInInfo PLUG_IN_INFO =
 
 MAIN ()
 
-static void query ()
+void query ()
 {
   static GParamDef load_args[] =
   {
diff --git a/plug-ins/faxg3/g3.c b/plug-ins/faxg3/g3.c
index 6bf658be17c1b4727d34f3cd1c0e66fe2b3a4152..f2f6bc07977697c39b419148605d470363b6af28 100644
--- a/plug-ins/faxg3/g3.c
+++ b/plug-ins/faxg3/g3.c
@@ -1,4 +1,4 @@
-#ident "@(#)g3.c	3.1 95/08/30 Copyright (c) Gert Doering"
+/* #ident "@(#)g3.c	3.1 95/08/30 Copyright (c) Gert Doering" */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/plug-ins/gbr/gbr.c b/plug-ins/gbr/gbr.c
index 64dbb1e0745cc5e207e7bde03c1cf92f42ed622f..5073a7b490fc6b467dc51b785571c5f5c1f30237 100644
--- a/plug-ins/gbr/gbr.c
+++ b/plug-ins/gbr/gbr.c
@@ -253,7 +253,7 @@ static gint32 load_image (char *filename) {
 			g_free(buffer);
 			return -1;
 		}
-		gimp_pixel_rgn_set_row(&pixel_rgn, buffer, 0, line, ph.width);
+		gimp_pixel_rgn_set_row(&pixel_rgn, (guchar *)buffer, 0, line, ph.width);
 		gimp_progress_update((double) line / (double) ph.height);
 	}
 
diff --git a/plug-ins/gif/gif.c b/plug-ins/gif/gif.c
index 8df4d2f68c38344864cb281b9774980231cfa7cc..e960c894d15975803f3cfebb9697544f803440b2 100644
--- a/plug-ins/gif/gif.c
+++ b/plug-ins/gif/gif.c
@@ -841,8 +841,8 @@ DoExtension (FILE *fd,
 	;
       return FALSE;
     default:
-      str = buf;
-      sprintf (buf, "UNKNOWN (0x%02x)", label);
+      str = (char *)buf;
+      sprintf ((char *)buf, "UNKNOWN (0x%02x)", label);
       break;
     }
 
diff --git a/plug-ins/gqbist/gqbist.c b/plug-ins/gqbist/gqbist.c
index 6de8321cebc7c9c68006a6dca1fb6eaac359977d..06b08508388dadbbd31ea1fa7252ef53deb1b089 100644
--- a/plug-ins/gqbist/gqbist.c
+++ b/plug-ins/gqbist/gqbist.c
@@ -374,7 +374,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret
 
 			gimp_progress_init ("Qbist ...");
 			for (row=sel_y1; row<sel_y2; row++) {
-				qbist(qbist_info, row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
+				qbist(qbist_info, (guchar *)row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
 				gimp_pixel_rgn_set_row(&imagePR, row_data, sel_x1, row, (sel_x2-sel_x1));
 				if ((row % 5) == 0) 
 					gimp_progress_update((gfloat)(row-sel_y1)/(gfloat)(sel_y2-sel_y1));
@@ -430,7 +430,7 @@ void dialog_update_previews(GtkWidget *widget, gpointer data)
 	for (j=0;j<9;j++) {
 		optimize(info[(j+5) % 9]);
 		for (i = 0; i < PREVIEW_SIZE; i++) {
-			qbist(info[(j+5) % 9], buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
+			qbist(info[(j+5) % 9], (gchar *)buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
 			gtk_preview_draw_row (GTK_PREVIEW (preview[j]), buf, 0, i, PREVIEW_SIZE);
 		}
 		gtk_widget_draw(preview[j], NULL);
diff --git a/plug-ins/hot/hot.c b/plug-ins/hot/hot.c
index dc49b187db0c079be71a83ab46b81733a7f339ec..5602f6e73f32ae95e95fbb757d98cd9d3d7e668d 100644
--- a/plug-ins/hot/hot.c
+++ b/plug-ins/hot/hot.c
@@ -569,7 +569,7 @@ pluginCoreIA(struct piArgs *argp) {
  * 0 to 1, the signal goes from the pedestal level to 100 IRE.
  * Chroma is always scaled to remain consistent with Y.
  */
-void
+static void
 build_tab(int m) {
   register double f;
   register int pv;
@@ -596,7 +596,7 @@ build_tab(int m) {
   icompos_lim = (int)(compos_lim * SCALE + 0.5);
 }
 
-int
+static int
 hotp(register guint8 r, register guint8 g, register guint8 b) {
   register int	y, i, q;
   register long	y2, c2;
diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c
index d2302bf2a4e369faa7ddb71975631a1ed4b6a59a..5048a6b18e167026760ab9e453ec3754c22f292e 100644
--- a/plug-ins/ifscompose/ifscompose.c
+++ b/plug-ins/ifscompose/ifscompose.c
@@ -2718,7 +2718,7 @@ ifs_compose_preview_callback (GtkWidget *widget,
   guchar *ptr;
 
   if (!ifsD->preview_data)
-    ifsD->preview_data = g_new(gchar,3*width*height);
+    ifsD->preview_data = g_new(guchar,3*width*height);
 
   gimp_palette_get_background ( &rc, &gc, &bc );
 
diff --git a/plug-ins/iwarp/iwarp.c b/plug-ins/iwarp/iwarp.c
index 0b277519668d61091bf5dd9f0c603d5ce9c0909a..57c683258b3aace72a59e691108e548d675780e2 100644
--- a/plug-ins/iwarp/iwarp.c
+++ b/plug-ins/iwarp/iwarp.c
@@ -215,7 +215,7 @@ static int frame_number;
 static int layer_alpha;
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -592,7 +592,7 @@ iwarp_layer_copy(gint32 layerID)
                                   
 
 
-void iwarp()
+static void iwarp()
 {
  int i;
  gint32 layerID;
diff --git a/plug-ins/max_rgb/max_rgb.c b/plug-ins/max_rgb/max_rgb.c
index ecff99e220879af8084a20f1b6e5afda40b589d1..4aa979e1138d0468de73ec97a319748dea3af24a 100644
--- a/plug-ins/max_rgb/max_rgb.c
+++ b/plug-ins/max_rgb/max_rgb.c
@@ -110,7 +110,7 @@ static Interface INTERFACE = { FALSE };
 gint	hold_max;
 gint	hold_min;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -169,7 +169,7 @@ run (char	*name,
       /* Since a channel might be selected, we must check wheter RGB or not. */
       if (!gimp_drawable_color(drawable_id))
 	{
-	  ERROR_DIALOG (1, "RGB drawable is not selected.");
+	  ERROR_DIALOG (1, (guchar *)"RGB drawable is not selected.");
 	  return;
 	}
       if (! DIALOG ())
diff --git a/plug-ins/maze/maze_face.c b/plug-ins/maze/maze_face.c
index b1b7815baf6741a17aa2560d433d1f632ec47975..e06d05bff942abd0009175080f8d97b24a6054bf 100644
--- a/plug-ins/maze/maze_face.c
+++ b/plug-ins/maze/maze_face.c
@@ -633,7 +633,7 @@ maze_close_callback (GtkWidget *widget,
 static void
 maze_help (GtkWidget *widget, gpointer foo)
 {
-     void *bar;
+     void *bar=(void *)NULL;
      gint baz;
 
      if (gimp_query_procedure("extension_web_browser", 
diff --git a/plug-ins/megawidget/megawidget.c b/plug-ins/megawidget/megawidget.c
index 9d61927331ef3bafcba74f988af9d284b3fb14ee..19911a0bfd2971f24ba9e0cbbf5c9bdce82350d4 100644
--- a/plug-ins/megawidget/megawidget.c
+++ b/plug-ins/megawidget/megawidget.c
@@ -309,7 +309,7 @@ struct mwColorSel * mw_color_select_button_create(
     GtkWidget *button;
     struct mwColorSel *cs = g_new(struct mwColorSel,1);
 
-    cs->name = name;
+    cs->name = (guchar *)name;
     cs->color = color;
     cs->opacity = opacity;
     cs->window = NULL;
@@ -344,7 +344,7 @@ void mw_ientry_new(GtkWidget *parent, gchar *fname,
 
    sprintf (buffer, "%d", *varp);
    mw_entry_new(parent, fname, name, 
-		varp, buffer, 
+		varp, (guchar *)buffer, 
 		(GtkCallback)ui_ientry_alone_callback);
 }
 
@@ -355,7 +355,7 @@ void mw_fentry_new(GtkWidget *parent, gchar *fname,
 
    sprintf (buffer, "%f0.3", *varp);
    mw_entry_new(parent, fname, name, 
-		varp, buffer, 
+		varp, (guchar *)buffer, 
 		(GtkCallback)ui_fentry_alone_callback);
 }
 
@@ -545,7 +545,7 @@ mw_entry_new(GtkWidget *parent, gchar *fname,
    entry = gtk_entry_new();
    gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
    gtk_widget_set_usize (entry, 75, 0);
-   gtk_entry_set_text (GTK_ENTRY (entry), buffer);
+   gtk_entry_set_text (GTK_ENTRY (entry), (const gchar *)buffer);
    gtk_signal_connect (GTK_OBJECT (entry), "changed",
 		       (GtkSignalFunc) entry_cb,
 		       variablep);
@@ -781,7 +781,7 @@ create_color_selection (GtkWidget *widget,
 			struct mwColorSel *cs)
 {
   if (!(cs->window)) {    
-    cs->window = gtk_color_selection_dialog_new (cs->name);
+    cs->window = gtk_color_selection_dialog_new ((const gchar *)cs->name);
     cs->savcolor[0]=cs->color[0];    /* For the cancel .... */
     cs->savcolor[1]=cs->color[1];
     cs->savcolor[2]=cs->color[2];
diff --git a/plug-ins/mpeg/mpeg.c b/plug-ins/mpeg/mpeg.c
index a0697c54da230a867a4e61dec326ce7d84c04e9e..7dd57ff9f8a7a7d6d89d116ba758acb51a7ed955 100644
--- a/plug-ins/mpeg/mpeg.c
+++ b/plug-ins/mpeg/mpeg.c
@@ -276,7 +276,7 @@ load_image (char *filename)
 	 plugin.
 
 	 */
-      moreframes = GetMPEGFrame(data);
+      moreframes = GetMPEGFrame((char *)data);
       if (!moreframes) break;
 
       if (delay > 0)
diff --git a/plug-ins/nlfilt/nlfilt.c b/plug-ins/nlfilt/nlfilt.c
index 7774a76651d1664721bb2c1ee669be93ecbb9259..768aabf60a14f078a8a9b005ef1df5683ca80fa5 100644
--- a/plug-ins/nlfilt/nlfilt.c
+++ b/plug-ins/nlfilt/nlfilt.c
@@ -471,7 +471,7 @@ gint noisevariance;      /* global so that pixel processing code can get at it q
 #define RUNSCALE(x) (((x) + (1 << (SCALEB-1))) >> SCALEB)       /* rounded un-scale */
 #define UNSCALE(x) ((x) >> SCALEB)
 
-void
+static void
 nlfiltRow(guchar *src, guchar *dst, gint width, gint Bpp, gint filtno) {
    gint x, po, no;
    gint pf[9];
@@ -524,7 +524,7 @@ gint AVEDIV[7 * NOCSVAL];              /* divide by 7 to give average value */
 gint SQUARE[2 * NOCSVAL];              /* scaled square lookup table */
 
 /* Table initialisation function - return alpha range */
-gint
+static inline gint
 nlfiltInit(gdouble alpha, gdouble radius, FilterType filter) {
    gint alpharange;                 /* alpha range value 0 - 3 */
    gdouble meanscale;               /* scale for finding mean */
diff --git a/plug-ins/pcx/pcx.c b/plug-ins/pcx/pcx.c
index ea1740061994ce301a65ec6327df62929deafcf7..fcc5f0782e4eab2293c5443ef2800c1b80cc7779 100644
--- a/plug-ins/pcx/pcx.c
+++ b/plug-ins/pcx/pcx.c
@@ -366,7 +366,7 @@ static void readline(FILE *fp, guchar *buffer, int bytes) {
   }
 }
 
-gint save_image (char *filename, gint32 image, gint32 layer) {
+static gint save_image (char *filename, gint32 image, gint32 layer) {
   FILE *fp;
   GPixelRgn pixel_rgn;
   GDrawable *drawable;
diff --git a/plug-ins/plasma/plasma.c b/plug-ins/plasma/plasma.c
index 880a3b32eb020cda4e3c9a7a9fc855f2be09100d..14bb1050cec807d15c2e28cac4d3eb6b3600e5f1 100644
--- a/plug-ins/plasma/plasma.c
+++ b/plug-ins/plasma/plasma.c
@@ -309,8 +309,8 @@ plasma_dialog()
   entry = gtk_entry_new ();
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0 );
   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
-  sprintf( buffer, "%d", pvals.seed );
-  gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+  sprintf( (char *)buffer, "%d", pvals.seed );
+  gtk_entry_set_text (GTK_ENTRY (entry), (gchar *)buffer );
   gtk_signal_connect (GTK_OBJECT (entry), "changed",
 		      (GtkSignalFunc) plasma_entry_callback,
 		      &pvals.seed);
diff --git a/plug-ins/pnm/pnm.c b/plug-ins/pnm/pnm.c
index 556b94fd012418ec4ff979be3f17036433ac5dbe..3028b895d0a3efdbd568752d5ec5428f1e88763a 100644
--- a/plug-ins/pnm/pnm.c
+++ b/plug-ins/pnm/pnm.c
@@ -457,7 +457,7 @@ load_image (char *filename)
 }
 
 
-void
+static void
 pnm_load_ascii (PNMScanner *scan,
 		PNMInfo    *info,
 		GPixelRgn  *pixel_rgn)
@@ -517,7 +517,7 @@ pnm_load_ascii (PNMScanner *scan,
   g_free (data);
 }
 
-void
+static void
 pnm_load_raw (PNMScanner *scan,
 	      PNMInfo    *info,
 	      GPixelRgn  *pixel_rgn)
@@ -564,7 +564,7 @@ pnm_load_raw (PNMScanner *scan,
 }
 
 void
-pnm_load_rawpbm (PNMScanner *scan,
+static pnm_load_rawpbm (PNMScanner *scan,
 		 PNMInfo    *info,
 		 GPixelRgn  *pixel_rgn)
 {
@@ -936,7 +936,7 @@ save_dialog ()
  *    Creates a new scanner based on a file descriptor.  The
  *    look ahead buffer is one character initially.
  */
-PNMScanner *
+static PNMScanner *
 pnmscanner_create (int fd)
 {
   PNMScanner *s;
@@ -952,7 +952,7 @@ pnmscanner_create (int fd)
 /* pnmscanner_destroy ---
  *    Destroys a scanner and its resources.  Doesn't close the fd.
  */
-void
+static void
 pnmscanner_destroy (PNMScanner *s)
 {
   if (s->inbuf) g_free(s->inbuf);
@@ -962,7 +962,7 @@ pnmscanner_destroy (PNMScanner *s)
 /* pnmscanner_createbuffer ---
  *    Creates a buffer so we can do buffered reads.
  */
-void
+static void
 pnmscanner_createbuffer (PNMScanner *s,
 			 int         bufsize)
 {
@@ -975,7 +975,7 @@ pnmscanner_createbuffer (PNMScanner *s,
 /* pnmscanner_gettoken ---
  *    Gets the next token, eating any leading whitespace.
  */
-void
+static void
 pnmscanner_gettoken (PNMScanner *s,
 		     char       *buf,
 		     int         bufsize)
@@ -994,7 +994,7 @@ pnmscanner_gettoken (PNMScanner *s,
 /* pnmscanner_getchar ---
  *    Reads a character from the input stream
  */
-void
+static void
 pnmscanner_getchar (PNMScanner *s)
 {
   if (s->inbuf)
@@ -1017,7 +1017,7 @@ pnmscanner_getchar (PNMScanner *s)
  *    Eats up whitespace from the input and returns when done or eof.
  *    Also deals with comments.
  */
-void
+static void
 pnmscanner_eatwhitespace (PNMScanner *s)
 {
   int state = 0;
diff --git a/plug-ins/print/print-escp2.c b/plug-ins/print/print-escp2.c
index ef1717885fbd1f132a1bbec2442ba33bc95652bd..3b607df27e0d7be53641fde6af4f56cb12222006 100644
--- a/plug-ins/print/print-escp2.c
+++ b/plug-ins/print/print-escp2.c
@@ -27,6 +27,25 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.3  1998/03/19 02:11:40  adrian
+ *    *AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
+ *           align_layers/align_layers.c animationplay/animationplay.c
+ *           bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c
+ *           exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c
+ *           gif/gif.c gqbist/gqbist.c hot/hot.c ifscompose/ifscompose.c
+ *           iwarp/iwarp.c max_rgb/max_rgb.c maze/maze_face.c
+ *           megawidget/megawidget.c mpeg/mpeg.c nlfilt/nlfilt.c pcx/pcx.c
+ *           plasma/plasma.c pnm/pnm.c print/print-escp2.c
+ *           print/print-pcl.c print/print.c scatter_hsv/scatter_hsv.c
+ *           script-fu/script-fu-scripts.c script-fu/script-fu.c
+ *           sinus/sinus.c tga/tga.c tileit/tileit.c
+ *           vpropagate/vpropagate.c xpm/xpm.c:  More picky picky ansi type
+ *           stuff from gimp-hpux-980316.patch.
+ *
+ *   	isnt big patches fun?
+ *
+ *   -adrian
+ *
  *   Revision 1.2  1998/01/25 09:29:25  yosh
  *   Plugin updates
  *   Properly generated aa Makefile (still not built by default)
@@ -466,7 +485,7 @@ escp2_print(FILE      *prn,		/* I - Print file or command */
  * 'escp2_write()' - Send ESC/P2 graphics using TIFF packbits compression.
  */
 
-void
+static void
 escp2_write(FILE          *prn,		/* I - Print file or command */
             unsigned char *line,	/* I - Output bitmap data */
             int           length,	/* I - Length of bitmap data */
diff --git a/plug-ins/print/print-pcl.c b/plug-ins/print/print-pcl.c
index 9f1ca499223169a5b88851c92e09613a5b7fee2c..7d42196babde1167f77eb2dac1601ce7e480ee7a 100644
--- a/plug-ins/print/print-pcl.c
+++ b/plug-ins/print/print-pcl.c
@@ -28,6 +28,25 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.3  1998/03/19 02:11:41  adrian
+ *    *AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
+ *           align_layers/align_layers.c animationplay/animationplay.c
+ *           bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c
+ *           exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c
+ *           gif/gif.c gqbist/gqbist.c hot/hot.c ifscompose/ifscompose.c
+ *           iwarp/iwarp.c max_rgb/max_rgb.c maze/maze_face.c
+ *           megawidget/megawidget.c mpeg/mpeg.c nlfilt/nlfilt.c pcx/pcx.c
+ *           plasma/plasma.c pnm/pnm.c print/print-escp2.c
+ *           print/print-pcl.c print/print.c scatter_hsv/scatter_hsv.c
+ *           script-fu/script-fu-scripts.c script-fu/script-fu.c
+ *           sinus/sinus.c tga/tga.c tileit/tileit.c
+ *           vpropagate/vpropagate.c xpm/xpm.c:  More picky picky ansi type
+ *           stuff from gimp-hpux-980316.patch.
+ *
+ *   	isnt big patches fun?
+ *
+ *   -adrian
+ *
  *   Revision 1.2  1998/01/25 09:29:26  yosh
  *   Plugin updates
  *   Properly generated aa Makefile (still not built by default)
@@ -508,7 +527,7 @@ pcl_print(FILE      *prn,		/* I - Print file or command */
  * 'pcl_mode0()' - Send PCL graphics using mode 0 (no) compression.
  */
 
-void
+static void
 pcl_mode0(FILE          *prn,		/* I - Print file or command */
           unsigned char *line,		/* I - Output bitmap data */
           int           length,		/* I - Length of bitmap data */
@@ -523,7 +542,7 @@ pcl_mode0(FILE          *prn,		/* I - Print file or command */
  * 'pcl_mode2()' - Send PCL graphics using mode 2 (TIFF) compression.
  */
 
-void
+static void
 pcl_mode2(FILE          *prn,		/* I - Print file or command */
           unsigned char *line,		/* I - Output bitmap data */
           int           length,		/* I - Length of bitmap data */
diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c
index ef538ef0b783b764930152453638537e02d11f2a..469cee6bda1d87bff36b98d9f6375fd03d2b27e4 100644
--- a/plug-ins/print/print.c
+++ b/plug-ins/print/print.c
@@ -39,6 +39,25 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.3  1998/03/19 02:11:42  adrian
+ *    *AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
+ *           align_layers/align_layers.c animationplay/animationplay.c
+ *           bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c
+ *           exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c
+ *           gif/gif.c gqbist/gqbist.c hot/hot.c ifscompose/ifscompose.c
+ *           iwarp/iwarp.c max_rgb/max_rgb.c maze/maze_face.c
+ *           megawidget/megawidget.c mpeg/mpeg.c nlfilt/nlfilt.c pcx/pcx.c
+ *           plasma/plasma.c pnm/pnm.c print/print-escp2.c
+ *           print/print-pcl.c print/print.c scatter_hsv/scatter_hsv.c
+ *           script-fu/script-fu-scripts.c script-fu/script-fu.c
+ *           sinus/sinus.c tga/tga.c tileit/tileit.c
+ *           vpropagate/vpropagate.c xpm/xpm.c:  More picky picky ansi type
+ *           stuff from gimp-hpux-980316.patch.
+ *
+ *   	isnt big patches fun?
+ *
+ *   -adrian
+ *
  *   Revision 1.2  1998/01/25 09:29:27  yosh
  *   Plugin updates
  *   Properly generated aa Makefile (still not built by default)
@@ -521,7 +540,7 @@ run(char   *name,		/* I - Name of print program. */
  * 'print_dialog()' - Pop up the print dialog...
  */
 
-int
+static int
 print_dialog(void)
 {
   int		i;		/* Looping var */
diff --git a/plug-ins/scatter_hsv/scatter_hsv.c b/plug-ins/scatter_hsv/scatter_hsv.c
index 4a27b97da4c1ffdfcdc1c4dd39c0866f3a570091..49c9f53c3509a9684b44a40ed5d17e9326b94e26 100644
--- a/plug-ins/scatter_hsv/scatter_hsv.c
+++ b/plug-ins/scatter_hsv/scatter_hsv.c
@@ -144,7 +144,7 @@ gint	preview_dragging = FALSE;
 gint	preview_drag_start_x = 0;
 gint	preview_drag_start_y = 0;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
@@ -202,7 +202,7 @@ run (char	*name,
       gimp_get_data (PLUG_IN_NAME, &VALS);
       if (!gimp_drawable_color(drawable_id))
 	{
-	  scatter_hsv_error_dialog (1, "RGB drawable is not selected.");
+	  scatter_hsv_error_dialog (1, (guchar *)"RGB drawable is not selected.");
 	  return;
 	}
       if (! DIALOG ())
@@ -627,7 +627,7 @@ ERROR_DIALOG (gint gtk_was_not_initialized, guchar *message)
   gtk_container_border_width (GTK_CONTAINER (table), 10);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
 
-  label = gtk_label_new (message);
+  label = gtk_label_new ((char *)message);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND,
 		    0, 0, 0);
 
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 45f077c1a40d1c7241adf9f8fbeee7aa80011336..20ccd46f204e760d43da57e56eebc7b40afd7df9 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -770,12 +770,12 @@ script_fu_interface (SFScript *script)
 
   sf_interface.script = script;
 
-  title = g_new (char, strlen ("Script-Fu: ") + strlen (script->description) + 1);
-  sprintf (title, "Script-Fu: %s", script->description);
+  title = g_new (guchar, strlen ("Script-Fu: ") + strlen (script->description) + 1);
+  sprintf ((char *)title, "Script-Fu: %s", script->description);
 
   dlg = gtk_dialog_new ();
   gtk_quit_add_destroy (1, GTK_OBJECT (dlg));
-  gtk_window_set_title (GTK_WINDOW (dlg), title);
+  gtk_window_set_title (GTK_WINDOW (dlg), (const gchar *)title);
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
 		      (GtkSignalFunc) script_fu_close_callback,
 		      NULL);
diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c
index 45f077c1a40d1c7241adf9f8fbeee7aa80011336..20ccd46f204e760d43da57e56eebc7b40afd7df9 100644
--- a/plug-ins/script-fu/script-fu-scripts.c
+++ b/plug-ins/script-fu/script-fu-scripts.c
@@ -770,12 +770,12 @@ script_fu_interface (SFScript *script)
 
   sf_interface.script = script;
 
-  title = g_new (char, strlen ("Script-Fu: ") + strlen (script->description) + 1);
-  sprintf (title, "Script-Fu: %s", script->description);
+  title = g_new (guchar, strlen ("Script-Fu: ") + strlen (script->description) + 1);
+  sprintf ((char *)title, "Script-Fu: %s", script->description);
 
   dlg = gtk_dialog_new ();
   gtk_quit_add_destroy (1, GTK_OBJECT (dlg));
-  gtk_window_set_title (GTK_WINDOW (dlg), title);
+  gtk_window_set_title (GTK_WINDOW (dlg), (const gchar *)title);
   gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
 		      (GtkSignalFunc) script_fu_close_callback,
 		      NULL);
diff --git a/plug-ins/script-fu/script-fu.c b/plug-ins/script-fu/script-fu.c
index d273918f9147a0c8d1f6b8e1e111fecd8f107ef5..94f6e956f5651ca538c2b7ce71a259425c8deb42 100644
--- a/plug-ins/script-fu/script-fu.c
+++ b/plug-ins/script-fu/script-fu.c
@@ -96,7 +96,7 @@ static gint script_fu_base = TRUE;
 extern gint server_mode;
 
 
-MAIN ();
+MAIN ()
 
 static void
 sfquit ()
diff --git a/plug-ins/sinus/sinus.c b/plug-ins/sinus/sinus.c
index 7fb250d3bdb751fe5afdfaa519785970eff81866..86245ec839f7f182decfdbe9c0468b2e60a2198b 100644
--- a/plug-ins/sinus/sinus.c
+++ b/plug-ins/sinus/sinus.c
@@ -596,12 +596,12 @@ int sinus_dialog(void)
   gtk_box_pack_start(GTK_BOX(vbox), logo, TRUE, FALSE, 0);
   gtk_widget_show(logo);
 
-  data= logo_data;
+  data= (guchar *)logo_data;
   for (y=0;y<100; y++) {
     for (x=0; x<100; x++) {
       HEADER_PIXEL(data,(&buf[3*x]));
     }
-    gtk_preview_draw_row(GTK_PREVIEW(logo), buf, 0, y, 100);
+    gtk_preview_draw_row(GTK_PREVIEW(logo), (guchar *)buf, 0, y, 100);
   }
 #endif
 
diff --git a/plug-ins/tga/tga.c b/plug-ins/tga/tga.c
index 915c2e4d303f3a3bf38301270eceeef6834752cc..513c4f357bc086596c4ca0d67de17c199c56e0a0 100644
--- a/plug-ins/tga/tga.c
+++ b/plug-ins/tga/tga.c
@@ -188,7 +188,7 @@ GPlugInInfo PLUG_IN_INFO =
 };
 
 
-MAIN ();
+MAIN ()
 
 #ifdef VERBOSE
 static int verbose = VERBOSE;
@@ -1101,7 +1101,7 @@ ReadImage (FILE *fp, struct tga_header *hdr, char *filename)
 }  /*read_image*/
 
 
-gint
+static gint
 save_image (char   *filename,
 	    gint32  image_ID,
 	    gint32  drawable_ID)
@@ -1127,8 +1127,8 @@ save_image (char   *filename,
   height = drawable->height;
 
   name_buf = (guchar *) g_malloc(strlen(filename) + 11);
-  sprintf(name_buf, "Saving %s:", filename);
-  gimp_progress_init(name_buf);
+  sprintf((char *)name_buf, "Saving %s:", filename);
+  gimp_progress_init((char *)name_buf);
   g_free(name_buf);
 
   memset (&hdr, 0, sizeof (hdr));
diff --git a/plug-ins/tileit/tileit.c b/plug-ins/tileit/tileit.c
index 90f06e72f896d621d1f0cbde60369887a4e0cb51..07700b5a49cb06a96a4c0d04f970caad6d1b2fa0 100644
--- a/plug-ins/tileit/tileit.c
+++ b/plug-ins/tileit/tileit.c
@@ -140,7 +140,7 @@ static TileItVals itvals =
 typedef enum {
   ALL,
   ALT,
-  EXPLICT,
+  EXPLICT
 } AppliedTo;
 
 typedef struct {
diff --git a/plug-ins/vpropagate/vpropagate.c b/plug-ins/vpropagate/vpropagate.c
index ca6868b269dd518af451d3501e5927855fc57d63..3242c06bfed2dab75e6b8b4ceeebd7ed1fa4436b 100644
--- a/plug-ins/vpropagate/vpropagate.c
+++ b/plug-ins/vpropagate/vpropagate.c
@@ -225,7 +225,7 @@ typedef struct
 static VPInterface vpropagate_interface = { FALSE };
 gint	drawable_id;
 
-MAIN ();
+MAIN ()
 
 static void
 query ()
diff --git a/plug-ins/xpm/xpm.c b/plug-ins/xpm/xpm.c
index 42b3b2107169d8d2d03b1f2e38f08e4ab3913029..1f663166ff21b6b929ad74f637ac90e8a157daa5 100644
--- a/plug-ins/xpm/xpm.c
+++ b/plug-ins/xpm/xpm.c
@@ -133,7 +133,7 @@ static XpmSaveInterface xpmint =
 
 
 
-MAIN ();
+MAIN ()
 
 static void
 query ()