--- a/src/insdel.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/insdel.h	Mon Aug 13 11:13:30 2007 +0200
@@ -22,8 +22,8 @@
 
 /* Mostly rewritten by Ben Wing. */
 
-#ifndef _XEMACS_INSDEL_H_
-#define _XEMACS_INSDEL_H_
+#ifndef INCLUDED_insdel_h_
+#define INCLUDED_insdel_h_
 
 /************************************************************************/
 /*                        changing a buffer's text                      */
@@ -38,16 +38,16 @@
 #define INSDEL_NO_LOCKING 2
 
 Charcount buffer_insert_string_1 (struct buffer *buf, Bufpos pos,
-				  CONST Bufbyte *nonreloc, Lisp_Object reloc,
+				  const Bufbyte *nonreloc, Lisp_Object reloc,
 				  Bytecount offset, Bytecount length,
 				  int flags);
 Charcount buffer_insert_raw_string_1 (struct buffer *buf, Bufpos pos,
-				      CONST Bufbyte *nonreloc,
+				      const Bufbyte *nonreloc,
 				      Bytecount length, int flags);
 Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Bufpos pos,
 				       Lisp_Object str, int flags);
 Charcount buffer_insert_c_string_1 (struct buffer *buf, Bufpos pos,
-				    CONST char *s, int flags);
+				    const char *s, int flags);
 Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Bufpos pos,
 				      Emchar ch, int flags);
 Charcount buffer_insert_c_char_1 (struct buffer *buf, Bufpos pos, char c,
@@ -140,11 +140,11 @@
 /************************************************************************/
 
 Memind do_marker_adjustment (Memind mpos, Memind from,
-			     Memind to, int amount);
+			     Memind to, Bytecount amount);
 
-void fixup_internal_substring (CONST Bufbyte *nonreloc,
+void fixup_internal_substring (const Bufbyte *nonreloc,
 			       Lisp_Object reloc,
-			       int offset, int *len);
+			       Bytecount offset, Bytecount *len);
 
 /* In font-lock.c */
 void font_lock_maybe_update_syntactic_caches (struct buffer *buf,
@@ -159,4 +159,4 @@
 void init_buffer_text (struct buffer *b);
 void uninit_buffer_text (struct buffer *b);
 
-#endif /* _XEMACS_INSDEL_H_ */
+#endif /* INCLUDED_insdel_h_ */