--- programs/Xserver/os/Imakefile.orig	Wed Mar 23 11:58:45 2005
+++ programs/Xserver/os/Imakefile	Sun Apr 17 08:32:03 2005
@@ -131,7 +131,8 @@
 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES)
        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
-		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes
+		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes \
+		  -I$(INCROOT)/X11
  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
 		  DependDefines