diff -urd xc.old/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
--- xc.old/lib/Xcursor/Imakefile	2004-04-05 23:50:53.000000000 -0400
+++ xc/lib/Xcursor/Imakefile	2004-04-06 00:15:09.488335280 -0400
@@ -46,6 +46,9 @@
 	  includedir="$(INCROOT)" \
 	  PACKAGE_VERSION="$(SOXCURSORREV).$(XCURSOR_REVISION)"
 
+#define IncludeSharedObjectInNormalLib
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 MANSUFFIX=$(LIBMANSUFFIX)
diff -urd xc.old/lib/Xext/Imakefile xc/lib/Xext/Imakefile
--- xc.old/lib/Xext/Imakefile	2004-04-05 23:50:53.000000000 -0400
+++ xc/lib/Xext/Imakefile	2004-04-06 00:17:04.115909240 -0400
@@ -39,6 +39,9 @@
 		XSecurity.o XAppgroup.o Xcup.o DPMS.o XEVI.o
      LINTLIBS = $(LINTXLIB)
 
+#define IncludeSharedObjectInNormalLib
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xi/Imakefile xc/lib/Xi/Imakefile
--- xc.old/lib/Xi/Imakefile	2004-04-05 23:50:54.000000000 -0400
+++ xc/lib/Xi/Imakefile	2004-04-06 00:17:53.876344504 -0400
@@ -102,6 +102,9 @@
 
        LINTLIBS = $(LINTXLIB) $(LINTXEXT)
 
+#define IncludeSharedObjectInNormalLib
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()
diff -urd xc.old/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
--- xc.old/lib/Xrandr/Imakefile	2004-04-05 23:50:55.000000000 -0400
+++ xc/lib/Xrandr/Imakefile	2004-04-06 00:18:34.560159624 -0400
@@ -28,6 +28,9 @@
 
 HEADERS = Xrandr.h
 
+#define IncludeSharedObjectInNormalLib
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 MANSUFFIX = $(LIBMANSUFFIX)
diff -urd xc.old/lib/Xrender/Imakefile xc/lib/Xrender/Imakefile
--- xc.old/lib/Xrender/Imakefile	2004-04-05 23:50:55.000000000 -0400
+++ xc/lib/Xrender/Imakefile	2004-04-06 00:00:55.096222624 -0400
@@ -133,6 +133,9 @@
 
 HEADERS = Xrender.h $(NONSTANDARD_HEADERS)
 
+#define IncludeSharedObjectInNormalLib
+#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+
 #include <Library.tmpl>
 
 DependTarget()