--- a/src/gui-x.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/gui-x.c	Mon Aug 13 10:28:48 2007 +0200
@@ -44,7 +44,6 @@
 /* we need a unique id for each popup menu, dialog box, and scrollbar */
 static unsigned int lwlib_id_tick;
 
-LWLIB_ID new_lwlib_id (void);
 LWLIB_ID
 new_lwlib_id (void)
 {
@@ -61,11 +60,6 @@
 
 
 #ifdef HAVE_POPUPS
-static Lisp_Object mark_popup_data (Lisp_Object obj,
-				      void (*markobj) (Lisp_Object));
-DEFINE_LRECORD_IMPLEMENTATION ("popup-data", popup_data,
-                               mark_popup_data, internal_object_printer,
-			       0, 0, 0, struct popup_data);
 
 struct mark_widget_value_closure
 {
@@ -112,6 +106,10 @@
   return data->last_menubar_buffer;
 }
 
+DEFINE_LRECORD_IMPLEMENTATION ("popup-data", popup_data,
+                               mark_popup_data, internal_object_printer,
+			       0, 0, 0, struct popup_data);
+
 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of
    (id . popup-data) for GCPRO'ing the callbacks of the popup menus
    and dialog boxes. */
@@ -122,7 +120,7 @@
 {
   struct popup_data *pdata;
   Lisp_Object lid = make_int (id);
-  Lisp_Object lpdata = Qnil;
+  Lisp_Object lpdata;
 
   assert (NILP (assq_no_quit (lid, Vpopup_callbacks)));
   pdata = alloc_lcrecord_type (struct popup_data, lrecord_popup_data);
@@ -229,7 +227,7 @@
 {
   Lisp_Object fn, arg;
   Lisp_Object data;
-  Lisp_Object frame = Qnil;
+  Lisp_Object frame;
   struct device *d = get_device_from_display (XtDisplay (widget));
   struct frame *f = x_any_widget_or_parent_to_frame (d, widget);
 
@@ -325,7 +323,7 @@
      using "===" in menubars to get double-etched lines */
   if (*p == '!' || *p == '\0')
     return ((first == '-')
-	    ? NULL		/* single etched is the default */
+	    ? NULL			/* single etched is the default */
 	    : xstrdup ("shadowDoubleEtchedIn"));
   else if (*p == ':')
     return xstrdup (p+1);
@@ -456,7 +454,7 @@
     {
       CONST char *const_bogosity;
       Lisp_Object suffix2;
-      
+
       /* Shortcut to avoid evaluating suffix each time */
       if (STRINGP (suffix))
 	suffix2 = suffix;