diff --git a/src/include/Makefile b/src/include/Makefile
index efa4fbdd4..d56852bad 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -3,38 +3,4 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-INC += dbDefs.h
-INC += epicsTypes.h
-INC += epicsVersion.h
-INC += gsd_sync_defs.h
-INC += shareLib.h
-#INC += createSoftLinks.sh 
-INC += osiMutexNOOP.h
-INC += unixFileName.h
-
-INC += drvTS.h
-INC += devSup.h
-INC += drvSup.h
-INC += caeventmask.h
-INC += asLib.h
-INC += registryDeviceSupport.h
-INC += registryDriverSupport.h
-INC += registryRecordType.h
-INC += cadef.h
-INC += caerr.h
-INC += task_params.h
-INC += fast_lock.h
-INC += asDbLib.h
-
-
-INC += osiFileName.h
-INC += osiSock.h
-
-include $(TOP)/configure/RULES_BUILD
-
-#	This seems to be handled wrong by gnumake:
-#	epicsVersion.h is rebuild in any case,
-#	no matter what date ...CONFIG_BASE_VERSION has
-epicsVersion.h: $(TOP)/configure/CONFIG_BASE_VERSION
-	$(PERL) ../makeEpicsVersion.pl $(TOP)/configure/CONFIG_BASE_VERSION
-
+include $(TOP)/configure/RULES_ARCHS
diff --git a/src/include/Makefile.Host b/src/include/Makefile.Host
new file mode 100644
index 000000000..77aa4c05a
--- /dev/null
+++ b/src/include/Makefile.Host
@@ -0,0 +1,42 @@
+
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+INC += dbDefs.h
+INC += epicsTypes.h
+INC += epicsVersion.h
+INC += gsd_sync_defs.h
+INC += shareLib.h
+#INC += createSoftLinks.sh 
+#INC += osiMutexNOOP.h
+INC += unixFileName.h
+
+INC += devSup.h
+INC += drvSup.h
+INC += caeventmask.h
+INC += asLib.h
+INC += registryDeviceSupport.h
+INC += registryDriverSupport.h
+INC += registryRecordType.h
+INC += cadef.h
+INC += caerr.h
+INC += asDbLib.h
+
+
+INC += osiFileName.h
+INC += osiSock.h
+
+include $(TOP)/configure/RULES_BUILD
+
+#	This seems to be handled wrong by gnumake:
+#	epicsVersion.h is rebuild in any case,
+#	no matter what date ...CONFIG_BASE_VERSION has
+epicsVersion.h: $(TOP)/configure/CONFIG_BASE_VERSION
+	$(PERL) ../makeEpicsVersion.pl $(TOP)/configure/CONFIG_BASE_VERSION
+
+install: $(INSTALL_INCLUDE)/epicsVersion.h
+
+xxx:
+	@echo INSTALL_INC = $(INSTALL_INC)
+	@echo OS_SRC_DIRS = $(OS_SRC_DIRS)
diff --git a/src/include/Makefile.Ioc b/src/include/Makefile.Ioc
new file mode 100644
index 000000000..c94f62010
--- /dev/null
+++ b/src/include/Makefile.Ioc
@@ -0,0 +1,10 @@
+
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+INC += osiFileName.h
+INC += osiSock.h
+
+include $(TOP)/configure/RULES_BUILD
+