From 1640f62c49f07f53c2120648ec38ab9edb33abb8 Mon Sep 17 00:00:00 2001
From: jcalcote <jcalcote@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Wed, 2 Jul 2008 22:26:11 +0000
Subject: [PATCH] Added FTKINC environment variable to Win32 build so that ftk
 and flaim, xflaim and sql directories don't have to be colocated in the same
 parent directory.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1076 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 flaim/win32/flaim/flaim/flaim.vcproj                          | 4 ++--
 flaim/win32/flaim/flaim_static/flaim_static.vcproj            | 4 ++--
 flaim/win32/flaim/flmcheckdb/flmcheckdb.vcproj                | 4 ++--
 flaim/win32/flaim/flmdbshell/flmdbshell.vcproj                | 4 ++--
 flaim/win32/flaim/flmgigatest/flmgigatest.vcproj              | 4 ++--
 flaim/win32/flaim/flmrebuild/flmrebuild.vcproj                | 4 ++--
 flaim/win32/flaim/flmutil/flmutil.vcproj                      | 4 ++--
 flaim/win32/flaim/flmview/flmview.vcproj                      | 4 ++--
 flaim/win32/flaim/ut_basictest/ut_basictest.vcproj            | 4 ++--
 sql/win32/sql/flaimsql/flaimsql.vcproj                        | 4 ++--
 sql/win32/sql/flaimsql_static/flaimsql_static.vcproj          | 4 ++--
 .../win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj   | 4 ++--
 .../win32/xflaim/unittests/ut_binarytest/ut_binarytest.vcproj | 4 ++--
 .../xflaim/unittests/ut_colldeftest/ut_colldeftest.vcproj     | 4 ++--
 .../unittests/ut_dictchangetest/ut_dictchangetest.vcproj      | 4 ++--
 .../xflaim/unittests/ut_dictdeftest/ut_dictdeftest.vcproj     | 4 ++--
 .../xflaim/unittests/ut_dirtyexittest/ut_dirtyexittest.vcproj | 4 ++--
 .../unittests/ut_dirtyexittest2/ut_dirtyexittest2.vcproj      | 4 ++--
 .../xflaim/unittests/ut_domnodetest/ut_domnodetest.vcproj     | 4 ++--
 xflaim/win32/xflaim/unittests/ut_enctest/ut_enctest.vcproj    | 4 ++--
 .../win32/xflaim/unittests/ut_importtest/ut_importtest.vcproj | 4 ++--
 .../xflaim/unittests/ut_indexdeftest/ut_indexdeftest.vcproj   | 4 ++--
 .../win32/xflaim/unittests/ut_indextest/ut_indextest.vcproj   | 4 ++--
 .../win32/xflaim/unittests/ut_indextest2/ut_indextest2.vcproj | 4 ++--
 .../win32/xflaim/unittests/ut_indextest3/ut_indextest3.vcproj | 4 ++--
 .../xflaim/unittests/ut_metaphonetest/ut_metaphonetest.vcproj | 4 ++--
 .../xflaim/unittests/ut_namespacetest/ut_namespacetest.vcproj | 4 ++--
 .../unittests/ut_regressiontest/ut_regressiontest.vcproj      | 4 ++--
 xflaim/win32/xflaim/unittests/ut_rfltest/ut_rfltest.vcproj    | 4 ++--
 .../xflaim/unittests/ut_sortkeytest/ut_sortkeytest.vcproj     | 4 ++--
 .../xflaim/unittests/ut_sortkeytest2/ut_sortkeytest2.vcproj   | 4 ++--
 .../win32/xflaim/unittests/ut_xpathtest/ut_xpathtest.vcproj   | 4 ++--
 .../win32/xflaim/unittests/ut_xpathtest2/ut_xpathtest2.vcproj | 4 ++--
 xflaim/win32/xflaim/xflaim/xflaim.vcproj                      | 4 ++--
 xflaim/win32/xflaim/xflaim_static/xflaim_static.vcproj        | 4 ++--
 xflaim/win32/xflaim/xflmcheckdb/xflmcheckdb.vcproj            | 4 ++--
 xflaim/win32/xflaim/xflmdbshell/xflmdbshell.vcproj            | 4 ++--
 xflaim/win32/xflaim/xflmrebuild/xflmrebuild.vcproj            | 4 ++--
 xflaim/win32/xflaim/xflmutil/xflmutil.vcproj                  | 4 ++--
 xflaim/win32/xflaim/xflmview/xflmview.vcproj                  | 4 ++--
 40 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/flaim/win32/flaim/flaim/flaim.vcproj b/flaim/win32/flaim/flaim/flaim.vcproj
index 2ec41e1..d7e52d9 100644
--- a/flaim/win32/flaim/flaim/flaim.vcproj
+++ b/flaim/win32/flaim/flaim/flaim.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDLL;_WINDOWS;_USRDLL;FLAIM_EXPORTS;FLM_DEBUG;FLM_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -122,7 +122,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDLL;_WINDOWS;_USRDLL;FLAIM_EXPORTS;FLM_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flaim_static/flaim_static.vcproj b/flaim/win32/flaim/flaim_static/flaim_static.vcproj
index 1d825de..d254f56 100644
--- a/flaim/win32/flaim/flaim_static/flaim_static.vcproj
+++ b/flaim/win32/flaim/flaim_static/flaim_static.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WINDOWS;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -109,7 +109,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WINDOWS;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmcheckdb/flmcheckdb.vcproj b/flaim/win32/flaim/flmcheckdb/flmcheckdb.vcproj
index 5501736..1ddc033 100644
--- a/flaim/win32/flaim/flmcheckdb/flmcheckdb.vcproj
+++ b/flaim/win32/flaim/flmcheckdb/flmcheckdb.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmdbshell/flmdbshell.vcproj b/flaim/win32/flaim/flmdbshell/flmdbshell.vcproj
index 8f4a118..1afe9f4 100644
--- a/flaim/win32/flaim/flmdbshell/flmdbshell.vcproj
+++ b/flaim/win32/flaim/flmdbshell/flmdbshell.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmgigatest/flmgigatest.vcproj b/flaim/win32/flaim/flmgigatest/flmgigatest.vcproj
index 17cbccc..c718653 100644
--- a/flaim/win32/flaim/flmgigatest/flmgigatest.vcproj
+++ b/flaim/win32/flaim/flmgigatest/flmgigatest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmrebuild/flmrebuild.vcproj b/flaim/win32/flaim/flmrebuild/flmrebuild.vcproj
index 4950550..1d97e3b 100644
--- a/flaim/win32/flaim/flmrebuild/flmrebuild.vcproj
+++ b/flaim/win32/flaim/flmrebuild/flmrebuild.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmutil/flmutil.vcproj b/flaim/win32/flaim/flmutil/flmutil.vcproj
index ab5b6b1..5e51b05 100644
--- a/flaim/win32/flaim/flmutil/flmutil.vcproj
+++ b/flaim/win32/flaim/flmutil/flmutil.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/flmview/flmview.vcproj b/flaim/win32/flaim/flmview/flmview.vcproj
index e872d9e..799811e 100644
--- a/flaim/win32/flaim/flmview/flmview.vcproj
+++ b/flaim/win32/flaim/flmview/flmview.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/flaim/win32/flaim/ut_basictest/ut_basictest.vcproj b/flaim/win32/flaim/ut_basictest/ut_basictest.vcproj
index ae5e89f..3fa00df 100644
--- a/flaim/win32/flaim/ut_basictest/ut_basictest.vcproj
+++ b/flaim/win32/flaim/ut_basictest/ut_basictest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\src, ..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FTK_STATIC_LINK;FLM_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/sql/win32/sql/flaimsql/flaimsql.vcproj b/sql/win32/sql/flaimsql/flaimsql.vcproj
index 09c1a1a..0c84c37 100644
--- a/sql/win32/sql/flaimsql/flaimsql.vcproj
+++ b/sql/win32/sql/flaimsql/flaimsql.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_WINDLL;_DEBUG;_WINDOWS;_USRDLL;FLM_DEBUG;SQF_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -124,7 +124,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDLL;_WINDOWS;_USRDLL;SQF_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/sql/win32/sql/flaimsql_static/flaimsql_static.vcproj b/sql/win32/sql/flaimsql_static/flaimsql_static.vcproj
index 3e692ab..af2f7fe 100644
--- a/sql/win32/sql/flaimsql_static/flaimsql_static.vcproj
+++ b/sql/win32/sql/flaimsql_static/flaimsql_static.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLM_DEBUG;SQF_SOURCE;SQF_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SQF_SOURCE;SQF_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj b/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj
index de2e288..4bbda0f 100644
--- a/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_basictest/ut_basictest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_binarytest/ut_binarytest.vcproj b/xflaim/win32/xflaim/unittests/ut_binarytest/ut_binarytest.vcproj
index bcb359d..861f2a9 100644
--- a/xflaim/win32/xflaim/unittests/ut_binarytest/ut_binarytest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_binarytest/ut_binarytest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_colldeftest/ut_colldeftest.vcproj b/xflaim/win32/xflaim/unittests/ut_colldeftest/ut_colldeftest.vcproj
index 5c78415..732b158 100644
--- a/xflaim/win32/xflaim/unittests/ut_colldeftest/ut_colldeftest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_colldeftest/ut_colldeftest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_dictchangetest/ut_dictchangetest.vcproj b/xflaim/win32/xflaim/unittests/ut_dictchangetest/ut_dictchangetest.vcproj
index e8f6fc9..5436a20 100644
--- a/xflaim/win32/xflaim/unittests/ut_dictchangetest/ut_dictchangetest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_dictchangetest/ut_dictchangetest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_dictdeftest/ut_dictdeftest.vcproj b/xflaim/win32/xflaim/unittests/ut_dictdeftest/ut_dictdeftest.vcproj
index c1c0e04..adf51fd 100644
--- a/xflaim/win32/xflaim/unittests/ut_dictdeftest/ut_dictdeftest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_dictdeftest/ut_dictdeftest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_dirtyexittest/ut_dirtyexittest.vcproj b/xflaim/win32/xflaim/unittests/ut_dirtyexittest/ut_dirtyexittest.vcproj
index e8ac569..fadd5c6 100644
--- a/xflaim/win32/xflaim/unittests/ut_dirtyexittest/ut_dirtyexittest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_dirtyexittest/ut_dirtyexittest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_dirtyexittest2/ut_dirtyexittest2.vcproj b/xflaim/win32/xflaim/unittests/ut_dirtyexittest2/ut_dirtyexittest2.vcproj
index 93d6fb9..61c5639 100644
--- a/xflaim/win32/xflaim/unittests/ut_dirtyexittest2/ut_dirtyexittest2.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_dirtyexittest2/ut_dirtyexittest2.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_domnodetest/ut_domnodetest.vcproj b/xflaim/win32/xflaim/unittests/ut_domnodetest/ut_domnodetest.vcproj
index 28c54b2..3bcb81b 100644
--- a/xflaim/win32/xflaim/unittests/ut_domnodetest/ut_domnodetest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_domnodetest/ut_domnodetest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_enctest/ut_enctest.vcproj b/xflaim/win32/xflaim/unittests/ut_enctest/ut_enctest.vcproj
index f142f48..ff9dc66 100644
--- a/xflaim/win32/xflaim/unittests/ut_enctest/ut_enctest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_enctest/ut_enctest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_importtest/ut_importtest.vcproj b/xflaim/win32/xflaim/unittests/ut_importtest/ut_importtest.vcproj
index 3743065..28ab408 100644
--- a/xflaim/win32/xflaim/unittests/ut_importtest/ut_importtest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_importtest/ut_importtest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_indexdeftest/ut_indexdeftest.vcproj b/xflaim/win32/xflaim/unittests/ut_indexdeftest/ut_indexdeftest.vcproj
index f833995..2c44b59 100644
--- a/xflaim/win32/xflaim/unittests/ut_indexdeftest/ut_indexdeftest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_indexdeftest/ut_indexdeftest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_indextest/ut_indextest.vcproj b/xflaim/win32/xflaim/unittests/ut_indextest/ut_indextest.vcproj
index 479d2e8..a500ff6 100644
--- a/xflaim/win32/xflaim/unittests/ut_indextest/ut_indextest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_indextest/ut_indextest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_indextest2/ut_indextest2.vcproj b/xflaim/win32/xflaim/unittests/ut_indextest2/ut_indextest2.vcproj
index 21536a4..17166d5 100644
--- a/xflaim/win32/xflaim/unittests/ut_indextest2/ut_indextest2.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_indextest2/ut_indextest2.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_indextest3/ut_indextest3.vcproj b/xflaim/win32/xflaim/unittests/ut_indextest3/ut_indextest3.vcproj
index 1c441ec..67516a8 100644
--- a/xflaim/win32/xflaim/unittests/ut_indextest3/ut_indextest3.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_indextest3/ut_indextest3.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_metaphonetest/ut_metaphonetest.vcproj b/xflaim/win32/xflaim/unittests/ut_metaphonetest/ut_metaphonetest.vcproj
index 8ca7460..b4f95b6 100644
--- a/xflaim/win32/xflaim/unittests/ut_metaphonetest/ut_metaphonetest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_metaphonetest/ut_metaphonetest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_namespacetest/ut_namespacetest.vcproj b/xflaim/win32/xflaim/unittests/ut_namespacetest/ut_namespacetest.vcproj
index 5d1d9fd..b7b3de4 100644
--- a/xflaim/win32/xflaim/unittests/ut_namespacetest/ut_namespacetest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_namespacetest/ut_namespacetest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_regressiontest/ut_regressiontest.vcproj b/xflaim/win32/xflaim/unittests/ut_regressiontest/ut_regressiontest.vcproj
index 1060827..e55ff1f 100644
--- a/xflaim/win32/xflaim/unittests/ut_regressiontest/ut_regressiontest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_regressiontest/ut_regressiontest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_rfltest/ut_rfltest.vcproj b/xflaim/win32/xflaim/unittests/ut_rfltest/ut_rfltest.vcproj
index b5dffc8..a5d69c0 100644
--- a/xflaim/win32/xflaim/unittests/ut_rfltest/ut_rfltest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_rfltest/ut_rfltest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_sortkeytest/ut_sortkeytest.vcproj b/xflaim/win32/xflaim/unittests/ut_sortkeytest/ut_sortkeytest.vcproj
index d968d9e..27c71f9 100644
--- a/xflaim/win32/xflaim/unittests/ut_sortkeytest/ut_sortkeytest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_sortkeytest/ut_sortkeytest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_sortkeytest2/ut_sortkeytest2.vcproj b/xflaim/win32/xflaim/unittests/ut_sortkeytest2/ut_sortkeytest2.vcproj
index 325e127..77e6b04 100644
--- a/xflaim/win32/xflaim/unittests/ut_sortkeytest2/ut_sortkeytest2.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_sortkeytest2/ut_sortkeytest2.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_xpathtest/ut_xpathtest.vcproj b/xflaim/win32/xflaim/unittests/ut_xpathtest/ut_xpathtest.vcproj
index 1790f5b..e0ef014 100644
--- a/xflaim/win32/xflaim/unittests/ut_xpathtest/ut_xpathtest.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_xpathtest/ut_xpathtest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/unittests/ut_xpathtest2/ut_xpathtest2.vcproj b/xflaim/win32/xflaim/unittests/ut_xpathtest2/ut_xpathtest2.vcproj
index 2206316..92f4f1d 100644
--- a/xflaim/win32/xflaim/unittests/ut_xpathtest2/ut_xpathtest2.vcproj
+++ b/xflaim/win32/xflaim/unittests/ut_xpathtest2/ut_xpathtest2.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\..\ftk\src,..\..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflaim/xflaim.vcproj b/xflaim/win32/xflaim/xflaim/xflaim.vcproj
index 69ceecc..2f06342 100644
--- a/xflaim/win32/xflaim/xflaim/xflaim.vcproj
+++ b/xflaim/win32/xflaim/xflaim/xflaim.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_WINDLL;_DEBUG;_WINDOWS;_USRDLL;FLM_DEBUG;XFL_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDLL;_WINDOWS;_USRDLL;XFL_SOURCE;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflaim_static/xflaim_static.vcproj b/xflaim/win32/xflaim/xflaim_static/xflaim_static.vcproj
index 7b59247..247edcd 100644
--- a/xflaim/win32/xflaim/xflaim_static/xflaim_static.vcproj
+++ b/xflaim/win32/xflaim/xflaim_static/xflaim_static.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflmcheckdb/xflmcheckdb.vcproj b/xflaim/win32/xflaim/xflmcheckdb/xflmcheckdb.vcproj
index 3538f2a..87e2220 100644
--- a/xflaim/win32/xflaim/xflmcheckdb/xflmcheckdb.vcproj
+++ b/xflaim/win32/xflaim/xflmcheckdb/xflmcheckdb.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflmdbshell/xflmdbshell.vcproj b/xflaim/win32/xflaim/xflmdbshell/xflmdbshell.vcproj
index b1196cd..344a144 100644
--- a/xflaim/win32/xflaim/xflmdbshell/xflmdbshell.vcproj
+++ b/xflaim/win32/xflaim/xflmdbshell/xflmdbshell.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflmrebuild/xflmrebuild.vcproj b/xflaim/win32/xflaim/xflmrebuild/xflmrebuild.vcproj
index 926c770..208545f 100644
--- a/xflaim/win32/xflaim/xflmrebuild/xflmrebuild.vcproj
+++ b/xflaim/win32/xflaim/xflmrebuild/xflmrebuild.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflmutil/xflmutil.vcproj b/xflaim/win32/xflaim/xflmutil/xflmutil.vcproj
index ce53e0b..b43c377 100644
--- a/xflaim/win32/xflaim/xflmutil/xflmutil.vcproj
+++ b/xflaim/win32/xflaim/xflmutil/xflmutil.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/xflaim/win32/xflaim/xflmview/xflmview.vcproj b/xflaim/win32/xflaim/xflmview/xflmview.vcproj
index ceeb96e..6520132 100644
--- a/xflaim/win32/xflaim/xflmview/xflmview.vcproj
+++ b/xflaim/win32/xflaim/xflmview/xflmview.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FLM_DEBUG;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\ftk\src,..\..\..\src, $(FTKINC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XFL_STATIC_LINK;FTK_STATIC_LINK;$(NOINHERIT)"
 				StringPooling="true"
 				MinimalRebuild="false"