diff --git a/test_extensions/gis/latlong/andoyer.vcproj b/test_extensions/gis/latlong/andoyer.vcproj
index 40fd85ca6..110148a99 100644
--- a/test_extensions/gis/latlong/andoyer.vcproj
+++ b/test_extensions/gis/latlong/andoyer.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../..;../../../../../../boost/geometry/extensions/contrib"
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../..;../../../../../../boost/geometry/extensions/contrib"
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/area_ll.vcproj b/test_extensions/gis/latlong/area_ll.vcproj
index a12a44a1e..ed9f0a4a4 100644
--- a/test_extensions/gis/latlong/area_ll.vcproj
+++ b/test_extensions/gis/latlong/area_ll.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../..;../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../..;../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/cross_track.vcproj b/test_extensions/gis/latlong/cross_track.vcproj
index 66b32bed6..5aae41e90 100644
--- a/test_extensions/gis/latlong/cross_track.vcproj
+++ b/test_extensions/gis/latlong/cross_track.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/distance_mixed.vcproj b/test_extensions/gis/latlong/distance_mixed.vcproj
index 7eec80ae2..28c0f510e 100644
--- a/test_extensions/gis/latlong/distance_mixed.vcproj
+++ b/test_extensions/gis/latlong/distance_mixed.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/test_extensions/gis/latlong/parse.cpp b/test_extensions/gis/latlong/parse.cpp
index 8ed2caf5b..a099d9b1f 100644
--- a/test_extensions/gis/latlong/parse.cpp
+++ b/test_extensions/gis/latlong/parse.cpp
@@ -17,7 +17,7 @@
 
 #include <geometry_test_common.hpp>
 
-#include <boost/geometry/algorithms/parse.hpp>
+#include <boost/geometry/extensions/algorithms/parse.hpp>
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test_extensions/gis/latlong/parse.vcproj b/test_extensions/gis/latlong/parse.vcproj
index f923abd70..062a36c02 100644
--- a/test_extensions/gis/latlong/parse.vcproj
+++ b/test_extensions/gis/latlong/parse.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				RuntimeLibrary="1"
 				ExceptionHandling="2"
@@ -112,7 +112,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/parse_dms.vcproj b/test_extensions/gis/latlong/parse_dms.vcproj
index 63a2443fd..582d23553 100644
--- a/test_extensions/gis/latlong/parse_dms.vcproj
+++ b/test_extensions/gis/latlong/parse_dms.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/point_ll.vcproj b/test_extensions/gis/latlong/point_ll.vcproj
index a3e0a0fe5..b8e06bb2e 100644
--- a/test_extensions/gis/latlong/point_ll.vcproj
+++ b/test_extensions/gis/latlong/point_ll.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../../.."
+				AdditionalIncludeDirectories="../../../../..;../../../test/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"
diff --git a/test_extensions/gis/latlong/vincenty.vcproj b/test_extensions/gis/latlong/vincenty.vcproj
index 4e6908074..950001e58 100644
--- a/test_extensions/gis/latlong/vincenty.vcproj
+++ b/test_extensions/gis/latlong/vincenty.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../../..;../..;../../../../../../boost/geometry/extensions/contrib"
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../..;../..;../../../../../../boost/geometry/extensions/contrib"
+				AdditionalIncludeDirectories="../../../../..;../../../test"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="2"
 				UsePrecompiledHeader="0"