Fix build glitches when building modules independently using Imake.

12 files changed, 18 insertions, 17 deletions

diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 04d2f90..c430f6e 100644
--- a/src/Speedo/spfont.c
+++ b/src/Speedo/spfont.c
@@ -57,7 +57,6 @@ from The Open Group.
 
 #include	"FSproto.h"
 #include	"spint.h"
-#include	"servermd.h"
 #include	"fontutil.h"
 #ifndef FONTMODULE
 #ifdef _XOPEN_SOURCE
@@ -68,6 +67,7 @@ from The Open Group.
 #undef _XOPEN_SOURCE
 #endif
 #else
+#include "servermd.h"
 #include "xf86_ansic.h"
 #endif
 
diff --git a/src/Type1/arith.c b/src/Type1/arith.c
index c9de69f..35191d9 100644
--- a/src/Type1/arith.c
+++ b/src/Type1/arith.c
@@ -49,8 +49,10 @@ assembly language, unlike C, will have 64-bit multiply products and
  
 The included files are:
 */
- 
-#include "os.h"
+
+#ifdef FONTMODULE
+# include "os.h"
+#endif
 #include "objects.h"
 #include "spaces.h"
 #include "arith.h"
diff --git a/src/Type1/curves.c b/src/Type1/curves.c
index 36336e4..b26c35c 100644
--- a/src/Type1/curves.c
+++ b/src/Type1/curves.c
@@ -43,8 +43,9 @@ through.
  
 Include files needed:
 */
- 
-#include "os.h"
+#ifdef FONTMODULE
+# include "os.h"
+#endif
 #include "objects.h"
 #include "spaces.h"
 #include "paths.h"
diff --git a/src/Type1/hints.c b/src/Type1/hints.c
index 691da9b..78aff15 100644
--- a/src/Type1/hints.c
+++ b/src/Type1/hints.c
@@ -40,8 +40,9 @@ W. Pryor, Jr.
  
 The included files are:
 */
- 
-#include "os.h" 
+#ifdef FONTMODULE
+# include "os.h"
+#endif
 #include "objects.h"
 #include "spaces.h"
 #include "paths.h"
diff --git a/src/Type1/objects.c b/src/Type1/objects.c
index e79b338..ca296e7 100644
--- a/src/Type1/objects.c
+++ b/src/Type1/objects.c
@@ -58,7 +58,6 @@ you do do not need to include these header files.
 #include  <string.h>
 #include  <ctype.h>
 #include  <stdarg.h>
-#include  "os.h"
 #else
 #include "Xdefs.h"	/* Bool declaration */
 #include "Xmd.h"	/* INT32 declaration */
diff --git a/src/Type1/paths.c b/src/Type1/paths.c
index 4fa5f06..6860ca1 100644
--- a/src/Type1/paths.c
+++ b/src/Type1/paths.c
@@ -44,7 +44,9 @@ The included files are:
 */
  
                              /*   after the system includes  (dsr)           */
-#include  "os.h"
+#ifdef FONTMODULE
+# include  "os.h"
+#endif
 #include  "objects.h"
 #include  "spaces.h"
 #include  "paths.h"
diff --git a/src/Type1/regions.c b/src/Type1/regions.c
index f747c8a..4d110ea 100644
--- a/src/Type1/regions.c
+++ b/src/Type1/regions.c
@@ -41,7 +41,9 @@ This module is responsible for creating and manipulating regions.
 The included files are:
 */
  
-#include  "os.h"
+#ifdef FONTMODULE
+# include  "os.h"
+#endif
 #include  "objects.h"
 #include  "spaces.h"
 #include  "paths.h"
diff --git a/src/Type1/spaces.c b/src/Type1/spaces.c
index 1b2e7ae..52e1105 100644
--- a/src/Type1/spaces.c
+++ b/src/Type1/spaces.c
@@ -46,7 +46,6 @@ This module is responsible for handling the TYPE1IMAGER "XYspace" object.
 #include "xf86_ansic.h"
 #else
 #include "X11/Xos.h"
-#include "os.h"
 #endif
 #include "objects.h"
 #include "spaces.h"
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index ecbd4d2..076c00b 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -125,9 +125,8 @@ from The Open Group.
 #include "Xdefs.h"
 #endif
 
-#include "os.h"
-
 #ifdef FONTMODULE
+#include "os.h"
 #include "xf86_ansic.h"
 #endif
 
diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c
index 9c885a0..d311d1e 100644
--- a/src/Type1/t1malloc.c
+++ b/src/Type1/t1malloc.c
@@ -43,8 +43,6 @@ routines (malloc/free).
 #include "Xmd.h"	/* INT32 declaration */
 #include "os.h"
 #include "xf86_ansic.h"
-#else
-#include "os.h"
 #endif
 #include "objects.h"	/* get #define for Abort() */
 
diff --git a/src/Type1/t1stub.c b/src/Type1/t1stub.c
index 2c6cfed..1ced8ef 100644
--- a/src/Type1/t1stub.c
+++ b/src/Type1/t1stub.c
@@ -36,7 +36,6 @@
 #include "xf86_ansic.h"
 #else 
 #include <stdio.h>
-#include "os.h"
 #endif
 #include "objects.h"	/* get #define for Abort() */
 
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index fb9dc81..41b958e 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group.
 
 #include    <X11/X.h>
 #include    <X11/Xproto.h>
-#include    <servermd.h>
 
 #ifndef DEFAULT_BIT_ORDER
 #ifdef BITMAP_BIT_ORDER