diff --git a/src/cas/generic/Makefile b/src/cas/generic/Makefile
index a45c55c28..56431ab04 100644
--- a/src/cas/generic/Makefile
+++ b/src/cas/generic/Makefile
@@ -3,7 +3,5 @@ TOP = ../../..
 
 include $(TOP)/configure/CONFIG
 
-INC := casdef.h casInternal.h casEventMask.h caNetAddr.h
-
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cas/generic/Makefile.Host b/src/cas/generic/Makefile.Host
new file mode 100644
index 000000000..a45c55c28
--- /dev/null
+++ b/src/cas/generic/Makefile.Host
@@ -0,0 +1,9 @@
+
+TOP = ../../..
+
+include $(TOP)/configure/CONFIG
+
+INC := casdef.h casInternal.h casEventMask.h caNetAddr.h
+
+include $(TOP)/configure/RULES_BUILD
+
diff --git a/src/cxxTemplates/Makefile b/src/cxxTemplates/Makefile
index 70b77b9a4..f036231b2 100644
--- a/src/cxxTemplates/Makefile
+++ b/src/cxxTemplates/Makefile
@@ -3,11 +3,5 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
-INC += resourceLib.h
-INC += tsDLList.h
-INC += tsSLList.h
-INC += tsMinMax.h
-INC += tsBTree.h
-
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cxxTemplates/Makefile.Host b/src/cxxTemplates/Makefile.Host
new file mode 100644
index 000000000..70b77b9a4
--- /dev/null
+++ b/src/cxxTemplates/Makefile.Host
@@ -0,0 +1,13 @@
+
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+INC += resourceLib.h
+INC += tsDLList.h
+INC += tsSLList.h
+INC += tsMinMax.h
+INC += tsBTree.h
+
+include $(TOP)/configure/RULES_BUILD
+
diff --git a/src/cxxTemplates/test/Makefile b/src/cxxTemplates/test/Makefile
index 738fda1d3..cb0865897 100644
--- a/src/cxxTemplates/test/Makefile
+++ b/src/cxxTemplates/test/Makefile
@@ -3,5 +3,5 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cxxTemplates/test/Makefile.Host b/src/cxxTemplates/test/Makefile.Host
new file mode 100644
index 000000000..956d178bf
--- /dev/null
+++ b/src/cxxTemplates/test/Makefile.Host
@@ -0,0 +1,15 @@
+
+TOP=../../..
+
+include $(TOP)/configure/CONFIG
+
+CXXCMPLR = STRICT
+
+PROD_LIBS = Com
+SYS_PROD_LIBS_WIN32 := ws2_32 advapi32
+
+TESTPROD := resourceLibTest tsDLListBench tsDLListTest tsDLListTest \
+		tsSLListBench tsSLListTest minmaxTest tsBTreeBench tsBTreeTest
+
+include $(TOP)/configure/RULES_BUILD
+
diff --git a/src/libCom/cxxTemplates/test/Makefile b/src/libCom/cxxTemplates/test/Makefile
index 738fda1d3..cb0865897 100644
--- a/src/libCom/cxxTemplates/test/Makefile
+++ b/src/libCom/cxxTemplates/test/Makefile
@@ -3,5 +3,5 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS