--- xorg-x11-6.8.2/xc/programs/Xserver/include/Imakefile	2004-04-23 23:54:23 +0400
+++ xorg-x11-6.8.x.99/xc/programs/Xserver/include/Imakefile	2005-06-28 15:54:52 +0400
@@ -5,6 +5,8 @@
 
 XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $
 
+HEADERS = os.h misc.h
+
 #if defined(XorgVersion) || defined(XFree86Version) \
 	|| defined(BSDOSArchitecture)
 #if DoLoadableServer
@@ -26,7 +28,6 @@
 
 depend::
 
-
 InstallDriverSDKNonExecFile(XIstubs.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(bstore.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(bstorestr.h,$(DRIVERSDKINCLUDEDIR))
@@ -61,3 +62,6 @@
 InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR))
+
+BuildIncludes($(HEADERS),X11,..)
+InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))