diff -urd xc.old/lib/XRes/Imakefile xc/lib/XRes/Imakefile
--- xc.old/lib/XRes/Imakefile	2004-04-05 22:05:46.000000000 -0400
+++ xc/lib/XRes/Imakefile	2004-04-05 22:10:06.409976568 -0400
@@ -8,6 +8,8 @@
 #define SoRev SOXRESREV
 #define LibHeaders NO
 
+#define IncludeSharedObjectInNormalLib
+
 #include <Threads.tmpl>
 
 #ifdef SharedXResReqs
diff -urd xc.old/lib/Xau/Imakefile xc/lib/Xau/Imakefile
--- xc.old/lib/Xau/Imakefile	2004-04-05 22:05:46.000000000 -0400
+++ xc/lib/Xau/Imakefile	2004-04-05 22:09:25.445204160 -0400
@@ -41,6 +41,8 @@
 
 #define IncludeSharedObjectInNormalLib
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xft/Imakefile xc/lib/Xft/Imakefile
--- xc.old/lib/Xft/Imakefile	2004-04-05 22:05:49.000000000 -0400
+++ xc/lib/Xft/Imakefile	2004-04-05 22:11:04.237185496 -0400
@@ -105,6 +105,8 @@
           xftname.o xftstr.o xftswap.o xftxlfd.o \
 	  xftfreetype.o xftglyphs.o xftrender.o xftcore.o
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 #if DoSharedLib && SharedDataSeparation
diff -urd xc.old/lib/Xinerama/Imakefile xc/lib/Xinerama/Imakefile
--- xc.old/lib/Xinerama/Imakefile	2004-04-05 22:05:50.000000000 -0400
+++ xc/lib/Xinerama/Imakefile	2004-04-05 22:09:25.488197624 -0400
@@ -27,4 +27,6 @@
 
 #include <Library.tmpl>
 
+SpecialCObjectRule(Xinerama,NullParameter,$(DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) -fPIC)
+
 DependTarget()
diff -urd xc.old/lib/Xss/Imakefile xc/lib/Xss/Imakefile
--- xc.old/lib/Xss/Imakefile	2004-04-05 22:05:51.000000000 -0400
+++ xc/lib/Xss/Imakefile	2004-04-05 22:09:25.521192608 -0400
@@ -30,4 +30,6 @@
 
 #include <Library.tmpl>
 
+SpecialCObjectRule(XScrnSaver,NullParameter,$(DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) -fPIC)
+
 DependTarget()
diff -urd xc.old/lib/Xv/Imakefile xc/lib/Xv/Imakefile
--- xc.old/lib/Xv/Imakefile	2004-04-05 22:05:52.000000000 -0400
+++ xc/lib/Xv/Imakefile	2004-04-05 22:09:25.553187744 -0400
@@ -25,6 +25,8 @@
 
 #define IncludeSharedObjectInNormalLib
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xxf86dga/Imakefile xc/lib/Xxf86dga/Imakefile
--- xc.old/lib/Xxf86dga/Imakefile	2004-04-05 22:05:53.000000000 -0400
+++ xc/lib/Xxf86dga/Imakefile	2004-04-05 22:09:25.584183032 -0400
@@ -28,6 +28,8 @@
 
 #define IncludeSharedObjectInNormalLib
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xxf86misc/Imakefile xc/lib/Xxf86misc/Imakefile
--- xc.old/lib/Xxf86misc/Imakefile	2004-04-05 22:05:53.000000000 -0400
+++ xc/lib/Xxf86misc/Imakefile	2004-04-05 22:09:25.613178624 -0400
@@ -28,6 +28,8 @@
 
 #define IncludeSharedObjectInNormalLib
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xxf86vm/Imakefile xc/lib/Xxf86vm/Imakefile
--- xc.old/lib/Xxf86vm/Imakefile	2004-04-05 22:05:53.000000000 -0400
+++ xc/lib/Xxf86vm/Imakefile	2004-04-05 22:09:25.614178472 -0400
@@ -28,6 +28,8 @@
 
 #define IncludeSharedObjectInNormalLib
 
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()