diff --git a/obm/ObmW/Gterm.c b/obm/ObmW/Gterm.c
index 04d5c12..69f412a 100644
--- a/obm/ObmW/Gterm.c
+++ b/obm/ObmW/Gterm.c
@@ -529,7 +529,7 @@ static void gm_focusin(), gm_focusout(), gm_refocus();
 static void gm_request_translations(), gm_load_translations();
 static int gm_curpos();
 
-static set_default_color_index();
+static void set_default_color_index();
 static void inherit_default_colormap();
 static void update_default_colormap();
 static void update_transients(), update_cursor();
@@ -586,8 +586,9 @@ static XImage *GetCachedXImage();				/* MF004 */
 
 static char 	*dbg_wSize();			/* debug utils		 */
 static char 	*dbg_visStr();
-
-extern double atof();
+static void dbg_printCmaps();
+static void dbg_printMappings();
+static void dbg_printRasters();
 
 
 
diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h
index a8a4cb4..b413da5 100644
--- a/obm/ObmW/Gterm.h
+++ b/obm/ObmW/Gterm.h
@@ -303,4 +303,112 @@ typedef struct _GtermClassRec *GtermWidgetClass;
 
 extern WidgetClass gtermWidgetClass;
 
+/*
+ * Gterm function declarations
+ */
+extern void GtActivate();
+extern void GtDeactivate();
+extern void GtReset();
+extern void GtFlush();
+extern int GtReady();
+extern void GtTimerInhibit();
+extern void GtSetDataLevel();
+extern void GtDeleteInputProc();
+extern void GtDeleteResizeProc();
+extern void GtDeleteResetProc();
+extern void GtPostInputProc();
+extern void GtPostResetProc();
+extern void GtPostResizeProc();
+extern int GtQueryRaster();
+extern void GtSetRaster();
+extern int GtGetRaster();
+extern void GtSetCursorPos();
+extern void GtGetCursorPos();
+extern void GtSetCursorType();
+extern void GtBell();
+extern void GtSetLogRes();
+extern void GtGetLogRes();
+extern void GtGetPhysRes();
+extern void GtSetPhysRes();
+extern void GtSetLineWidth();
+extern void GtSetLineStyle();
+extern void GtSetColorIndex();
+extern void GtSetFillType();
+extern void GtClearScreen();
+extern void GtDrawPolyline();
+extern void GtDrawPolymarker();
+extern void GtDrawPolygon();
+extern void GtDrawAlphaText();
+extern void GtGetAlphaTextSize();
+extern void GtStartDialog();
+extern void GtEndDialog();
+extern void GtEraseDialog();
+extern void GtDrawDialogText();
+extern void GtGetDialogTextSize();
+extern void GtRasterInit();
+extern int GtAssignRaster();
+extern int GtCreateRaster();
+extern void GtDestroyRaster();
+extern int GtNextRaster();
+extern int GtNRasters();
+extern int GtWritePixels();
+extern int GtReadPixels();
+extern void GtRefreshPixels();
+extern int GtGetClientPixel();
+extern int GtSetPixels();
+extern Pixmap GtExtractPixmap();
+extern int GtInsertPixmap();
+extern int GtNextColormap();
+extern void GtFreeColormap();
+extern int GtWriteColormap();
+extern int GtReadColormap();
+extern int GtLoadColormap();
+extern int GtQueryColormap();
+extern void GtSetColormapFocus();
+extern void GtInitMappings();
+extern int GtNextMapping();
+extern void GtFreeMapping();
+extern int GtDisableMapping();
+extern void GtLowerMapping();
+extern void GtRaiseMapping();
+extern int GtActiveMapping();
+extern int GtEnableMapping();
+extern void GtRefreshMapping();
+extern int GtSetMapping();
+extern int GtGetMapping();
+extern int GtCompareMappings();
+extern int GtCopyRaster();
+extern int GtSelectRaster();
+extern void GtSetDisplayRaster();
+extern void GtMarkerInit();
+extern void GtMapVector();
+extern void GtPixelToNDC();
+extern void GtNDCToPixel();
+extern void GtOverrideTranslations();
+extern void GtWriteAlphaCursor();
+extern void GtEraseAlphaCursor();
+extern void GtSetTextRes();
+extern void GtReadIomap();
+extern void GtWriteIomap();
+extern void GtReadLUT();
+
+extern void GmAddCallback();
+extern void GmDeleteCallback();
+extern int GmDestroy();
+extern int GmGetAttribute();
+extern void GmGetAttributes();
+extern void GmGetBoundingBox();
+extern int GmGetVertices();
+extern int GmStrToType();
+extern int GmStrToEvent();
+extern int GmStrToFunction();
+extern void GmLower();
+extern int GmSetAttributes();
+extern int GmSetAttribute();
+extern void GmMarkpos();
+extern void GmRedraw();
+extern void GmNotify();
+extern void GmRaise();
+extern void GmSetVertices();
+
 #endif /* _Gterm_h */
diff --git a/obm/ObmW/GtermCnv.c b/obm/ObmW/GtermCnv.c
index 427d17c..45d261e 100644
--- a/obm/ObmW/GtermCnv.c
+++ b/obm/ObmW/GtermCnv.c
@@ -211,7 +211,7 @@ int     bpl, bpp, border;
 
     
     if (DBG_TRACE) {
-	start = time ((time_t) NULL);
+	start = time (NULL);
 	fprintf (stderr, "renderPix: ENTER\n");
     }
 
@@ -246,7 +246,7 @@ int     bpl, bpp, border;
 	fprintf (stderr,
 	    "renderPix: pix %d %d  cmap %d %d  xcol 0x%x 0x%x  bpp = %d\n",
 	    min,max, cmin,cmax, xmin,xmax, bpp);
-	end = time ((time_t) NULL);
+	end = time (NULL);
 	fprintf (stderr, "renderPix: DONE  time = %.5f  %ld %ld\n",
 	    difftime(start,end), (long)start, (long)end);
     }
@@ -257,6 +257,7 @@ int     bpl, bpp, border;
 
 /*  Compute the lookup table for the RGB rendering.
 */
+int
 init_lut (bpp, border)
 int	bpp;
 int	border;
@@ -395,8 +396,7 @@ int lowbit(unsigned long i)
 
 /* Debug Utilities.
 */
-bob() { int i = 0; fprintf (stderr, "Hi from Bob\n");  }
-
+static void
 dbg_printCmaps (GtermWidget w)
 {
     int     i, j, first, nelem, maxelem, nc;
@@ -444,6 +444,7 @@ dbg_printCmaps (GtermWidget w)
           w->gterm.cmap_in[i], w->gterm.cmap_out[i]);
 }
 
+static void
 dbg_printMappings (GtermWidget w)
 {
     Mapping mp;
@@ -466,6 +467,7 @@ dbg_printMappings (GtermWidget w)
 }
 
 
+static void
 dbg_printRasters (GtermWidget w)
 {
     register int i;
diff --git a/obm/ObmW/GtermGraphics.c b/obm/ObmW/GtermGraphics.c
index 0ad2956..e73db7e 100644
--- a/obm/ObmW/GtermGraphics.c
+++ b/obm/ObmW/GtermGraphics.c
@@ -4,6 +4,7 @@
  * --------------------------------------
  */
 
+void
 GtActivate (w)
     GtermWidget w;
 {
@@ -11,6 +12,7 @@ GtActivate (w)
     w->gterm.save_x = w->gterm.save_y = 0;
 }
 
+void
 GtDeactivate (w)
     GtermWidget w;
 {
@@ -37,12 +39,14 @@ GtDeactivate (w)
     }
 }
 
+int
 GtReady (w)
     GtermWidget w;
 {
     return (w->gterm.delay == 0);
 }
 
+void
 GtReset (w)
     GtermWidget w;
 {
@@ -60,6 +64,7 @@ GtReset (w)
     w->gterm.raster     = 0;
 }
 
+void
 GtTimerInhibit (w, state)
     GtermWidget w;
     Boolean state;
@@ -70,6 +75,7 @@ GtTimerInhibit (w, state)
     w->gterm.useTimers = !state;
 }
 
+void
 GtAugmentTranslations (w, translations)
     register GtermWidget w;
     char *translations;
@@ -85,6 +91,7 @@ GtAugmentTranslations (w, translations)
     }
 }
 
+void
 GtOverrideTranslations (w, translations)
     register GtermWidget w;
     char *translations;
@@ -100,12 +107,14 @@ GtOverrideTranslations (w, translations)
     }
 }
 
+void
 GtFlush (w)
     GtermWidget w;
 {
     XFlush (w->gterm.display);
 }
 
+void
 GtSetLogRes (w, width, height)
     GtermWidget w;
     int width, height;
@@ -114,6 +123,7 @@ GtSetLogRes (w, width, height)
     w->gterm.yres = height;
 }
 
+void
 GtGetLogRes (w, width, height)
     GtermWidget w;
     int *width, *height;
@@ -122,6 +132,7 @@ GtGetLogRes (w, width, height)
     *height = w->gterm.yres;
 }
 
+void
 GtGetPhysRes (w, raster, width, height)
     GtermWidget w;
     int raster;				/* zero for screen size */
@@ -137,6 +148,7 @@ GtGetPhysRes (w, raster, width, height)
     }
 }
 
+void
 GtSetPhysRes (w, raster, width, height)
     GtermWidget w;
     int raster;
@@ -145,6 +157,7 @@ GtSetPhysRes (w, raster, width, height)
     GtCreateRaster (w, raster, GtServer, width, height, RasterDepth);
 }
 
+void
 GtSetRaster (w, raster)
     GtermWidget w;
     int raster;
@@ -155,6 +168,7 @@ GtSetRaster (w, raster)
     }
 }
 
+int
 GtGetRaster (w)
     GtermWidget w;
 {
@@ -162,6 +176,7 @@ GtGetRaster (w)
 }
 
 /* ARGSUSED */
+void
 GtSetTextRes (w, optrows, optcols)
     GtermWidget w;
     int optrows, optcols;
@@ -171,12 +186,14 @@ GtSetTextRes (w, optrows, optcols)
 }
 
 /* ARGSUSED */
+void
 GtSetCharSize (w, ival)
     GtermWidget w;
     int ival;
 {
 }
 
+void
 GtSetDataLevel (w, ival)
     GtermWidget w;
     int ival;
@@ -214,6 +231,7 @@ GtSetDataLevel (w, ival)
 }
 
 
+void
 GtSetLineWidth (w, ival)
     GtermWidget w;
     int ival;
@@ -227,6 +245,7 @@ GtSetLineWidth (w, ival)
 #define	DashDot		"\016\003\001\003"
 #define	Dash3Dot	"\024\003\001\003\001\003\001\003"
 
+void
 GtSetLineStyle (w, ival)
     GtermWidget w;
     int ival;
@@ -372,6 +391,7 @@ GtermWidget w;
         initialize_shadow_pixmap (w, 0);
 }
 
+void
 GtDrawPolyline (w, pv, npts)
     GtermWidget w;
     XPoint *pv;
@@ -397,6 +417,7 @@ GtDrawPolyline (w, pv, npts)
     update_transients (w, (Region)NULL);
 }
 
+void
 GtDrawPolymarker (w, pv, npts)
     GtermWidget w;
     XPoint *pv;
@@ -422,6 +443,7 @@ GtDrawPolymarker (w, pv, npts)
     update_transients (w, (Region)NULL);
 }
 
+void
 GtDrawPolygon (w, pv, npts)
     GtermWidget w;
     XPoint *pv;
@@ -478,6 +500,7 @@ GtDrawPolygon (w, pv, npts)
     update_transients (w, (Region)NULL);
 }
 
+void
 GtDrawMarker (w, x, y, xsize, ysize, type)
     GtermWidget w;
     int x, y;
@@ -486,6 +509,7 @@ GtDrawMarker (w, x, y, xsize, ysize, type)
 {
 }
 
+void
 GtBell (w)
     GtermWidget w;
 {
@@ -841,6 +865,7 @@ blink_cursor (w, id)
 	    interval, (XtTimerCallbackProc) blink_cursor, (XtPointer)w);
 }
 
+void
 GtPostInputProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -861,6 +886,7 @@ GtPostInputProc (w, userfcn, client_data)
 	w->gterm.inputCallback = new;
 }
 
+void
 GtDeleteInputProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -880,6 +906,7 @@ GtDeleteInputProc (w, userfcn, client_data)
 	    prev = cb;
 }
 
+void
 GtPostResetProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -900,6 +927,7 @@ GtPostResetProc (w, userfcn, client_data)
 	w->gterm.resetCallback = new;
 }
 
+void
 GtDeleteResetProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -919,6 +947,7 @@ GtDeleteResetProc (w, userfcn, client_data)
 	    prev = cb;
 }
 
+void
 GtPostResizeProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -939,6 +968,7 @@ GtPostResizeProc (w, userfcn, client_data)
 	w->gterm.resizeCallback = new;
 }
 
+void
 GtDeleteResizeProc (w, userfcn, client_data)
     GtermWidget w;
     GtCallbackProc userfcn;
@@ -958,6 +988,7 @@ GtDeleteResizeProc (w, userfcn, client_data)
 	    prev = cb;
 }
 
+void
 GtDrawAlphaText (w, x, y, text)
     GtermWidget w;
     int x, y;
@@ -987,6 +1018,7 @@ GtDrawAlphaText (w, x, y, text)
     update_transients (w, (Region)NULL);
 }
 
+void
 GtGetAlphaTextSize (w, string, width, height, base)
     GtermWidget w;
     char *string;
@@ -1004,17 +1036,20 @@ GtGetAlphaTextSize (w, string, width, height, base)
     *base = fp->max_bounds.ascent;
 }
 
+void
 GtWriteAlphaCursor (w, x, y)
     GtermWidget w;
     int x, y;
 {
 }
 
+void
 GtEraseAlphaCursor (w)
     GtermWidget w;
 {
 }
 
+void
 GtStartDialog (w)
     GtermWidget w;
 {
@@ -1039,6 +1074,7 @@ GtStartDialog (w)
 	fprintf (stderr, "GtStartDialog:  LEAVING\n");
 }
 
+void
 GtEndDialog (w)
     GtermWidget w;
 {
@@ -1046,6 +1082,7 @@ GtEndDialog (w)
     w->gterm.d_saved = 0;
 }
 
+void
 GtEraseDialog (w)
     GtermWidget w;
 {
@@ -1069,6 +1106,7 @@ GtEraseDialog (w)
 	fprintf (stderr, "GtEraseDialog:  LEAVING\n");
 }
 
+void
 GtDrawDialogText (w, x, y, text)
     GtermWidget w;
     int x, y;
@@ -1084,6 +1122,7 @@ GtDrawDialogText (w, x, y, text)
 	w->gterm.dialogGC, xpos, ypos, text, strlen(text));
 }
 
+void
 GtGetDialogTextSize (w, string, width, height, base)
     GtermWidget w;
     char *string;
@@ -1107,7 +1146,7 @@ GtGetDialogTextSize (w, string, width, height, base)
  * ----------------------------------------
  */
 
-static
+static void
 set_default_color_index (w)
     GtermWidget w;
 {
diff --git a/obm/ObmW/GtermImaging.c b/obm/ObmW/GtermImaging.c
index cd42545..497ef47 100644
--- a/obm/ObmW/GtermImaging.c
+++ b/obm/ObmW/GtermImaging.c
@@ -2160,6 +2160,7 @@ get_pixel (w, client_pixel)
 
 /* GtGetClientPixel -- Convert a gterm pixel into a client pixel.
  */
+int
 GtGetClientPixel (w, pixel)
     GtermWidget w;
     register int pixel;
@@ -2183,6 +2184,7 @@ GtGetClientPixel (w, pixel)
 
 /* GtInitMappings -- Delete all mappings and initialize the mapping subsystem.
  */
+void
 GtInitMappings (w)
     register GtermWidget w;
 {
@@ -2219,6 +2221,7 @@ GtInitMappings (w)
 /* GtNextMapping -- Return the index of the next available mapping descriptor.
  * This routine always returns a mapping index of 1 or higher.
  */
+int
 GtNextMapping (w)
     register GtermWidget w;
 {
@@ -2237,6 +2240,7 @@ GtNextMapping (w)
 
 /* GtFreeMapping -- Free a mapping descriptor.
  */
+void
 GtFreeMapping (w, mapping)
     register GtermWidget w;
     int mapping;
@@ -2316,6 +2320,7 @@ GtLowerMapping (w, mapping, reference)
  * negative value is returned if the m1 < m2, zero is returned if the
  * mappings are the same, and a positive value is returned if m1 > m2.
  */
+int
 GtCompareMappings (w, map1, map2)
     register GtermWidget w;
     int map1, map2;
@@ -2360,6 +2365,7 @@ GtCompareMappings (w, map1, map2)
  * the raster is 10 pixels wide, the client coordinate system would range
  * from 0.5 to 10.5 at the edges of the NDC space.
  */
+int
 GtSelectRaster (w, dras, dt, dx, dy, rt, rx, ry, rmap)
     GtermWidget w;
     int dras;		/* display raster */
@@ -2473,6 +2479,7 @@ GtSelectRaster (w, dras, dt, dx, dy, rt, rx, ry, rmap)
  * force a refresh, implement a transient mapping, or in the case of a dezoom
  * (many-to-one) mapping, select the antialiasing technique to be used.
  */
+int
 GtCopyRaster (w, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
     GtermWidget w;
     int rop;			/* rasterop */
@@ -2525,6 +2532,7 @@ GtCopyRaster (w, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
  * which were previously covered by the mapping but which were exposed by
  * modifying the mapping are redrawn.
  */
+int
 GtSetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
     GtermWidget w;
     int mapping;		/* mapping number */
@@ -2763,6 +2771,7 @@ GtSetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
  * mapping is defined but not enabled, and 1 is returned if the mapping
  * is active.
  */
+int
 GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
     GtermWidget w;
     int mapping;		/* mapping number */
@@ -2793,6 +2802,7 @@ GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny)
 
 /* GtActiveMapping -- Query whether a mapping is active.
  */
+int
 GtActiveMapping (w, mapping)
     register GtermWidget w;
     int mapping;		/* mapping number */
@@ -2813,6 +2823,7 @@ GtActiveMapping (w, mapping)
  * mapping activates the mapping so that any changes to the source will
  * be mapped to the destination.
  */
+int
 GtEnableMapping (w, mapping, refresh)
     GtermWidget w;
     int mapping;		/* mapping number */
@@ -2848,7 +2859,7 @@ GtEnableMapping (w, mapping, refresh)
 ** and we have no way to get back to the pixel values.
 ** 
 */	 
-
+void
 GtSetDisplayRaster (gt, raster)
     GtermWidget gt;
     int raster;				/* raster number */
@@ -2865,6 +2876,7 @@ GtSetDisplayRaster (gt, raster)
  * reenabled.  If the ERASE flag is set the destination region is redrawn
  * with the mapping disabled.
  */
+int
 GtDisableMapping (w, mapping, erase)
     GtermWidget w;
     int mapping;		/* mapping number */
@@ -2921,6 +2933,7 @@ GtDisableMapping (w, mapping, erase)
 
 /* GtRefreshMapping -- Refresh the destination region defined by a mapping.
  */
+void
 GtRefreshMapping (w, mapping)
     GtermWidget w;
     int mapping;		/* mapping number */
@@ -2963,6 +2976,7 @@ GtRefreshMapping (w, mapping)
  * point vector is maintained in floating point for this operation to avoid
  * loss of precision.  The input and output vectors may be the same vector.
  */
+void
 GtMapVector (w, mapping, dir, pv1, pv2, npts)
     GtermWidget w;
     int mapping;
@@ -3028,6 +3042,7 @@ GtMapVector (w, mapping, dir, pv1, pv2, npts)
  * coordinate system of the given reference raster.  The input and output
  * vectors may be the same vector.
  */
+void
 GtPixelToNDC (w, raster, pv1, pv2, npts)
     GtermWidget w;
     int raster;
@@ -3051,6 +3066,7 @@ GtPixelToNDC (w, raster, pv1, pv2, npts)
  * coordinate system of the given reference raster.  The input and output
  * vectors may be the same vector.
  */
+void
 GtNDCToPixel (w, raster, pv1, pv2, npts)
     GtermWidget w;
     int raster;
@@ -3085,6 +3101,7 @@ GtNDCToPixel (w, raster, pv1, pv2, npts)
  *
  * This routine is intended only for use during debugging.
  */
+void
 GtDebug (w, fp, what)
     GtermWidget w;
     FILE *fp;
diff --git a/obm/ObmW/GtermMarker.c b/obm/ObmW/GtermMarker.c
index e1ffc09..232d056 100644
--- a/obm/ObmW/GtermMarker.c
+++ b/obm/ObmW/GtermMarker.c
@@ -121,6 +121,7 @@ static XtActionsRec markerActionsList[] = {
 
 /* GtMarkerInit -- Initialize the marker subsystem.
  */
+void
 GtMarkerInit (w)
     GtermWidget w;
 {
@@ -508,6 +509,7 @@ GmCreate (w, type, interactive)
 
 /* GmDestroy -- Destroy a marker.
  */
+int
 GmDestroy (gm)
     register Marker gm;
 {
@@ -640,6 +642,7 @@ GmCopy (gm)
 
 /* GmAddCallback -- Add a callback to a marker.
  */
+void
 GmAddCallback (gm, events, func, client_data)
     register Marker gm;
     int events;			/* events callback is to receive */
@@ -671,6 +674,7 @@ GmAddCallback (gm, events, func, client_data)
 /* GmDeleteCallback -- Delete a previously posted callback given the
  * function pointer and client data passed when the callback was registered.
  */
+void
 GmDeleteCallback (gm, func, client_data)
     register Marker gm;
     GmIMethod func;		/* callback function */
@@ -730,6 +734,7 @@ GmSelect (w, x, y, what)
  * the marker.  This is used to erase the old marker when the modified
  * marker is later redrawn.
  */
+void
 GmMarkpos (gm)
     register Marker gm;
 {
@@ -743,6 +748,7 @@ GmMarkpos (gm)
  * old marker is first erased, then any markers affected by the erase are
  * redrawn, and finally the current marker is redrawn at the new location.
  */
+void
 GmRedraw (gm, func, erase)
     Marker gm;
     int func;
@@ -956,6 +962,7 @@ GmLower (gm, ref_gm)
 /* GmNotify -- Notify any clients that have registered callbacks that the
  * given marker events have occurred.
  */
+void
 GmNotify (gm, events, event, params, nparams)
     register Marker gm;
     int events;
@@ -969,6 +976,7 @@ GmNotify (gm, events, event, params, nparams)
 
 /* GmAddPt -- Add a point to a marker.
  */
+void
 GmAddPt (gm, x, y)
     register Marker gm;
     int x, y;
@@ -985,6 +993,7 @@ GmAddPt (gm, x, y)
 
 /* GmDeletePt -- Delete a point from a marker.
  */
+void
 GmDeletePt (gm, x, y)
     register Marker gm;
     int x, y;
@@ -1001,6 +1010,7 @@ GmDeletePt (gm, x, y)
 
 /* GmMovePt -- Move a point within a marker.
  */
+void
 GmMovePt (gm, x, y)
     register Marker gm;
     int x, y;
@@ -1016,6 +1026,7 @@ GmMovePt (gm, x, y)
 
 /* GmMove -- Move a marker.
  */
+void
 GmMove (gm, x, y)
     register Marker gm;
     int x, y;
@@ -1031,6 +1042,7 @@ GmMove (gm, x, y)
 
 /* GmResize -- Resize a marker.
  */
+void
 GmResize (gm, x, y)
     register Marker gm;
     int x, y;
@@ -1046,6 +1058,7 @@ GmResize (gm, x, y)
 
 /* GmRotate -- Rotate a marker.
  */
+void
 GmRotate (gm, x, y)
     register Marker gm;
     int x, y;
@@ -1063,6 +1076,7 @@ GmRotate (gm, x, y)
  * values be specified in the same type.  Autoredraw, if enabled, is suspended
  * until all attributes have been changed.
  */
+int
 GmSetAttributes (gm, args, nargs, argtype)
     register Marker gm;
     ArgList args;
@@ -1095,6 +1109,7 @@ GmSetAttributes (gm, args, nargs, argtype)
 
 /* GmSetAttribute -- Set the value of a marker attribute.
  */
+int
 GmSetAttribute (gm, attribute, value, type)
     register Marker gm;
     char *attribute;
@@ -1343,6 +1358,7 @@ GmSetAttribute (gm, attribute, value, type)
 /* GmGetAttributes -- Get a list of attributes.  Requires that all attribute
  * values be specified in the same type.
  */
+void
 GmGetAttributes (gm, args, nargs, argtype)
     register Marker gm;
     ArgList args;
@@ -1358,6 +1374,7 @@ GmGetAttributes (gm, args, nargs, argtype)
 
 /* GmGetAttribute -- Get the value of a marker attribute.
  */
+int
 GmGetAttribute (gm, attribute, value, type)
     register Marker gm;
     char *attribute;
@@ -1659,6 +1676,7 @@ GmSetVertices (gm, points, first, npts)
 /* GmGetVertices -- Get the vertices of a "poly" type object.  The actual
  * number of points output is returned as the function value.
  */
+int
 GmGetVertices (gm, points, first, maxpts)
     register Marker gm;
     register DPoint *points;	/* output array of points */
@@ -1696,6 +1714,7 @@ GmGetVertices (gm, points, first, maxpts)
 /* GmGetBoundingBox -- Returns a rect large enough to completely enclose a
  * marker, regardless of its type or orientation.
  */
+void
 GmGetBoundingBox (gm, x, y, width, height)
     register Marker gm;
     int *x, *y;
@@ -1712,6 +1731,7 @@ GmGetBoundingBox (gm, x, y, width, height)
 
 /* GmStrToType -- Convert a marker type string to a marker type code.
  */
+int
 GmStrToType (marker_type)
 register char *marker_type;
 {
@@ -1742,6 +1762,7 @@ register char *marker_type;
 
 /* GmStrToEvent -- Convert a marker event type string to a marker event code.
  */
+int
 GmStrToEvent (event_type)
 register char *event_type;
 {
@@ -1775,6 +1796,7 @@ register char *event_type;
 /* GmStrToFunction -- Convert a drawing function string to the corresponding
  * XLIB function code.
  */
+int
 GmStrToFunction (function)
 register char *function;
 {
@@ -4462,6 +4484,7 @@ gm_select (gm, x, y, what)
     return (0);
 }
 
+int
 point_in_poly (npol, xp, yp, x, y)
 int 	npol;
 float 	*xp, *yp, x, y;
diff --git a/obm/marker.c b/obm/marker.c
index 9e60120..15c9251 100644
--- a/obm/marker.c
+++ b/obm/marker.c
@@ -1570,8 +1570,7 @@ char **argv;
 	XtSetArg (args[2], GmY, &y);
 	XtSetArg (args[3], GmWidth, &width);
 	XtSetArg (args[4], GmHeight, &height);
-	if (GmGetAttributes (mp->gm, args, 5, XtRInt) < 0)
-	    return (TCL_ERROR);
+	GmGetAttributes (mp->gm, args, 5, XtRInt);
 
 	if (GmGetAttribute (mp->gm, GmRotangle, &rotangle, XtRFloat) < 0)
 	    return (TCL_ERROR);
@@ -1821,8 +1820,7 @@ char **argv;
 	XtSetArg (args[2], GmY, &y);
 	XtSetArg (args[3], GmWidth, &width);
 	XtSetArg (args[4], GmHeight, &height);
-	if (GmGetAttributes (mp->gm, args, 5, XtRInt) < 0)
-	    return (TCL_ERROR);
+	GmGetAttributes (mp->gm, args, 5, XtRInt);
 
 	/* Get the coordinates of the marker boundary. */
 	if (marker_type == Gm_Text) {
diff --git a/ximtool/iis.c b/ximtool/iis.c
index fe0f1d0..8164a82 100644
--- a/ximtool/iis.c
+++ b/ximtool/iis.c
@@ -12,6 +12,7 @@
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
+#include <ObmW/Gterm.h>
 #include "ximtool.h"
 #include "iis.h"
 
diff --git a/ximtool/load.c b/ximtool/load.c
index 3091983..9f14ed7 100644
--- a/ximtool/load.c
+++ b/ximtool/load.c
@@ -8,6 +8,7 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 
+#include <ObmW/Gterm.h>
 #include "ximtool.h"
 
 /* LOAD.C -- Package for browsing directories and loading raster files into
diff --git a/ximtool/logo.c b/ximtool/logo.c
index 0b0e74f..0cc3401 100644
--- a/ximtool/logo.c
+++ b/ximtool/logo.c
@@ -7,6 +7,7 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 
+#include <ObmW/Gterm.h>
 #include "ximtool.h"
 #include "logo.h"