3 files changed, 1 insertions, 16 deletions
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h
index 731c85f..fb4f76e 100644
--- a/include/X11/fonts/bitmap.h
+++ b/include/X11/fonts/bitmap.h
@@ -37,11 +37,7 @@ from The Open Group.
 #define _BITMAP_H_
 
 #include <X11/fonts/fntfilio.h>
-#ifndef FONTMODULE
 #include <stdio.h>  /* just for NULL */
-#else
-#include "xf86_ansic.h"
-#endif
 
 /*
  * Internal format used to store bitmap fonts
diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h
index 1a71eae..407c4cf 100644
--- a/include/X11/fonts/fntfilst.h
+++ b/include/X11/fonts/fntfilst.h
@@ -34,9 +34,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _FONTFILEST_H_
 #define _FONTFILEST_H_
 
-#ifndef FONTMODULE
 #include <X11/Xos.h>
-#endif
 #ifndef XP_PSTEXT
 #include <X11/fonts/fontmisc.h>
 #endif
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index 7b86517..3fc60ff 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -34,19 +34,10 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _FONTMISC_H_
 #define _FONTMISC_H_
 
-#ifndef FONTMODULE
 #include <X11/Xfuncs.h>
 #include <stdlib.h>
 #include <stdio.h>
-
-#ifndef X_NOT_POSIX
 #include <unistd.h>
-#else
-extern int close();
-#endif
-
-#endif /* FONTMODULE */
-
 #include <X11/Xdefs.h>
 
 
@@ -89,7 +80,7 @@ extern int f_strcasecmp(const char *s1, const char *s2);
 #define assert(x)	((void)0)
 
 #ifndef strcasecmp
-#if defined(NEED_STRCASECMP) && !defined(FONTMODULE)
+#if defined(NEED_STRCASECMP)
 #define strcasecmp(s1,s2) f_strcasecmp(s1,s2)
 #endif
 #endif