--- a/src/keymap.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/keymap.h	Mon Aug 13 11:13:30 2007 +0200
@@ -21,14 +21,15 @@
 /* Synched up with: Not in FSF. */
 
 
-#ifndef _XEMACS_KEYMAP_H_
-#define _XEMACS_KEYMAP_H_
+#ifndef INCLUDED_keymap_h_
+#define INCLUDED_keymap_h_
 
-DECLARE_LRECORD (keymap, struct Lisp_Keymap);
-#define XKEYMAP(x) XRECORD (x, keymap, struct Lisp_Keymap)
+typedef struct Lisp_Keymap Lisp_Keymap;
+
+DECLARE_LRECORD (keymap, Lisp_Keymap);
+#define XKEYMAP(x) XRECORD (x, keymap, Lisp_Keymap)
 #define XSETKEYMAP(x, p) XSETRECORD (x, p, keymap)
 #define KEYMAPP(x) RECORDP (x, keymap)
-#define GC_KEYMAPP(x) GC_RECORDP (x, keymap)
 #define CHECK_KEYMAP(x) CHECK_RECORD (x, keymap)
 #define CONCHECK_KEYMAP(x) CONCHECK_RECORD (x, keymap)
 
@@ -56,7 +57,7 @@
 void key_desc_list_to_event (Lisp_Object list, Lisp_Object event,
 			     int allow_menu_events);
 
-int event_matches_key_specifier_p (struct Lisp_Event *event,
+int event_matches_key_specifier_p (Lisp_Event *event,
 				   Lisp_Object key_specifier);
 
-#endif /* _XEMACS_KEYMAP_H_ */
+#endif /* INCLUDED_keymap_h_ */