--- a/src/syntax.h	Mon Aug 13 11:32:27 2007 +0200
+++ b/src/syntax.h	Mon Aug 13 11:33:38 2007 +0200
@@ -20,8 +20,8 @@
 
 /* Synched up with: FSF 19.28. */
 
-#ifndef _XEMACS_SYNTAX_H_
-#define _XEMACS_SYNTAX_H_
+#ifndef INCLUDED_syntax_h_
+#define INCLUDED_syntax_h_
 
 #include "chartab.h"
 
@@ -72,9 +72,9 @@
 #define SYNTAX_CODE_UNSAFE(table, c) \
    XINT (CHAR_TABLE_VALUE_UNSAFE (table, c))
 
-INLINE int SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c);
+INLINE int SYNTAX_CODE (Lisp_Char_Table *table, Emchar c);
 INLINE int
-SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c)
+SYNTAX_CODE (Lisp_Char_Table *table, Emchar c)
 {
   return SYNTAX_CODE_UNSAFE (table, c);
 }
@@ -85,9 +85,9 @@
 #define SYNTAX_FROM_CODE(code) ((enum syntaxcode) ((code) & 0177))
 #define SYNTAX(table, c) SYNTAX_FROM_CODE (SYNTAX_CODE (table, c))
 
-INLINE int WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c);
+INLINE int WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c);
 INLINE int
-WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c)
+WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c)
 {
   return SYNTAX (table, c) == Sword;
 }
@@ -249,6 +249,6 @@
 extern int no_quit_in_re_search;
 extern struct buffer *regex_emacs_buffer;
 
-void update_syntax_table (struct Lisp_Char_Table *ct);
+void update_syntax_table (Lisp_Char_Table *ct);
 
-#endif /* _XEMACS_SYNTAX_H_ */
+#endif /* INCLUDED_syntax_h_ */