--- a/src/sysfile.h	Fri May 05 21:51:13 2006 +0000
+++ b/src/sysfile.h	Sat May 06 08:09:37 2006 +0000
@@ -467,6 +467,7 @@
 #define SEPCHAR ';'
 #define DEFAULT_DIRECTORY_SEP '\\'
 
+#ifdef emacs
 DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void))
 {
   if (!CHARP (Vdirectory_sep_char)
@@ -484,6 +485,13 @@
 }
 #define DIRECTORY_SEP sysfile_get_directory_sep()
 
+#else /* emacs */
+
+/* The above Lisp variables are not available to make-docfile, etc. */
+#define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP
+
+#endif /* emacs */
+
 #else /* not WIN32_NATIVE */
 
 #define SEPCHAR ':'
@@ -499,6 +507,8 @@
 
 #define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP)
 
+#ifdef emacs
+
 DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c))
 {
   return (c == '/' || c == '\\');
@@ -509,6 +519,22 @@
   return (c == '/' || c == '\\' || c == ':');
 }
 
+#else /* emacs */
+
+/* The Ichar typedef is not available to make-docfile, etc. */
+
+DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (int c))
+{
+  return (c == '/' || c == '\\');
+}
+
+DECLARE_INLINE_HEADER (int IS_ANY_SEP (int c))
+{
+  return (c == '/' || c == '\\' || c == ':');
+}
+
+#endif
+
 #else /* not WIN32_ANY */
 
 #define IS_DEVICE_SEP(c) 0