From 28688e9b7b4b2ce282a183735e1787af7bf53594 Mon Sep 17 00:00:00 2001
From: Fabien Costantini <fabien@onepost.net>
Date: Mon, 3 Nov 2008 00:21:15 +0000
Subject: corrected non cairo build targets and also fast_slow project not
 loading problem.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6495 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 ide/vc2005/CubeView.vcproj       | 16 ++++++++--------
 ide/vc2005/adjuster.vcproj       | 16 ++++++++--------
 ide/vc2005/arc.vcproj            | 16 ++++++++--------
 ide/vc2005/ask.vcproj            | 16 ++++++++--------
 ide/vc2005/bitmap.vcproj         | 16 ++++++++--------
 ide/vc2005/boxtype.vcproj        | 16 ++++++++--------
 ide/vc2005/browser.vcproj        | 16 ++++++++--------
 ide/vc2005/button.vcproj         | 16 ++++++++--------
 ide/vc2005/buttons.vcproj        | 16 ++++++++--------
 ide/vc2005/cairo_test.vcproj     | 16 ++++++++--------
 ide/vc2005/checkers.vcproj       | 16 ++++++++--------
 ide/vc2005/clock.vcproj          | 16 ++++++++--------
 ide/vc2005/colbrowser.vcproj     | 16 ++++++++--------
 ide/vc2005/color_chooser.vcproj  | 16 ++++++++--------
 ide/vc2005/cube.vcproj           | 16 ++++++++--------
 ide/vc2005/cursor.vcproj         | 16 ++++++++--------
 ide/vc2005/curve.vcproj          | 16 ++++++++--------
 ide/vc2005/demo.vcproj           | 16 ++++++++--------
 ide/vc2005/doublebuffer.vcproj   | 16 ++++++++--------
 ide/vc2005/editor.vcproj         | 16 ++++++++--------
 ide/vc2005/fast_slow.vcproj      | 19 +++++++++++--------
 ide/vc2005/file_chooser.vcproj   | 16 ++++++++--------
 ide/vc2005/fltk.lib.vcproj       |  8 ++++----
 ide/vc2005/fltkdll.vcproj        | 36 ++++++++++++++++++------------------
 ide/vc2005/fltkforms.vcproj      |  8 ++++----
 ide/vc2005/fltkgl.vcproj         |  8 ++++----
 ide/vc2005/fltkimages.vcproj     |  8 ++++----
 ide/vc2005/fluid.vcproj          |  8 ++++----
 ide/vc2005/fonts.vcproj          | 16 ++++++++--------
 ide/vc2005/forms.vcproj          | 16 ++++++++--------
 ide/vc2005/fractals.vcproj       | 16 ++++++++--------
 ide/vc2005/fullscreen.vcproj     | 16 ++++++++--------
 ide/vc2005/gl_overlay.vcproj     | 16 ++++++++--------
 ide/vc2005/glpuzzle.vcproj       | 16 ++++++++--------
 ide/vc2005/hello.vcproj          | 16 ++++++++--------
 ide/vc2005/help.vcproj           | 16 ++++++++--------
 ide/vc2005/iconize.vcproj        | 16 ++++++++--------
 ide/vc2005/image.vcproj          | 16 ++++++++--------
 ide/vc2005/inactive.vcproj       | 16 ++++++++--------
 ide/vc2005/input.vcproj          | 16 ++++++++--------
 ide/vc2005/input_choice.vcproj   | 16 ++++++++--------
 ide/vc2005/jpeg.vcproj           |  8 ++++----
 ide/vc2005/keyboard.vcproj       | 16 ++++++++--------
 ide/vc2005/label.vcproj          | 16 ++++++++--------
 ide/vc2005/libpng.vcproj         |  8 ++++----
 ide/vc2005/line_style.vcproj     | 16 ++++++++--------
 ide/vc2005/mandelbrot.vcproj     | 24 ++++++++++++------------
 ide/vc2005/menubar.vcproj        | 16 ++++++++--------
 ide/vc2005/message.vcproj        | 16 ++++++++--------
 ide/vc2005/minimum.vcproj        | 16 ++++++++--------
 ide/vc2005/navigation.vcproj     | 16 ++++++++--------
 ide/vc2005/output.vcproj         | 16 ++++++++--------
 ide/vc2005/overlay.vcproj        | 16 ++++++++--------
 ide/vc2005/pack.vcproj           | 16 ++++++++--------
 ide/vc2005/pixmap.vcproj         | 16 ++++++++--------
 ide/vc2005/pixmap_browser.vcproj | 16 ++++++++--------
 ide/vc2005/preferences.vcproj    | 16 ++++++++--------
 ide/vc2005/radio.vcproj          | 24 ++++++++++++------------
 ide/vc2005/resize.vcproj         | 24 ++++++++++++------------
 ide/vc2005/resizebox.vcproj      | 16 ++++++++--------
 ide/vc2005/scroll.vcproj         | 16 ++++++++--------
 ide/vc2005/shape.vcproj          | 16 ++++++++--------
 ide/vc2005/subwindow.vcproj      | 16 ++++++++--------
 ide/vc2005/sudoku.vcproj         | 16 ++++++++--------
 ide/vc2005/symbols.vcproj        | 16 ++++++++--------
 ide/vc2005/tabs.vcproj           | 24 ++++++++++++------------
 ide/vc2005/threads.vcproj        | 16 ++++++++--------
 ide/vc2005/tile.vcproj           | 16 ++++++++--------
 ide/vc2005/tiled_image.vcproj    | 16 ++++++++--------
 ide/vc2005/utf8.vcproj           | 16 ++++++++--------
 ide/vc2005/valuators.vcproj      | 24 ++++++++++++------------
 ide/vc2005/zlib.vcproj           | 14 +++++++-------
 72 files changed, 580 insertions(+), 577 deletions(-)

diff --git a/ide/vc2005/CubeView.vcproj b/ide/vc2005/CubeView.vcproj
index 8b7bf7757..1d1d4e075 100644
--- a/ide/vc2005/CubeView.vcproj
+++ b/ide/vc2005/CubeView.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib"
-				OutputFile="../test/CubeViewd.exe"
+				OutputFile="../../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -168,7 +168,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib"
-				OutputFile="../test/CubeView.exe"
+				OutputFile="../../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/CubeViewd.exe"
+				OutputFile="../../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -356,7 +356,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="../test/CubeView.exe"
+				OutputFile="../../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/adjuster.vcproj b/ide/vc2005/adjuster.vcproj
index 0e67fbc75..ffb348470 100644
--- a/ide/vc2005/adjuster.vcproj
+++ b/ide/vc2005/adjuster.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/adjusterd.exe"
+				OutputFile="../../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/adjuster.exe"
+				OutputFile="../../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/adjusterd.exe"
+				OutputFile="../../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/adjuster.exe"
+				OutputFile="../../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/arc.vcproj b/ide/vc2005/arc.vcproj
index db2b05003..b9d7da151 100644
--- a/ide/vc2005/arc.vcproj
+++ b/ide/vc2005/arc.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/arcd.exe"
+				OutputFile="../../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/arc.exe"
+				OutputFile="../../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/arcd.exe"
+				OutputFile="../../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/arc.exe"
+				OutputFile="../../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/ask.vcproj b/ide/vc2005/ask.vcproj
index a200c70dd..8c4981c24 100644
--- a/ide/vc2005/ask.vcproj
+++ b/ide/vc2005/ask.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/askd.exe"
+				OutputFile="../../test/askd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/ask.exe"
+				OutputFile="../../test/ask.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/askd.exe"
+				OutputFile="../../test/askd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/ask.exe"
+				OutputFile="../../test/ask.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/bitmap.vcproj b/ide/vc2005/bitmap.vcproj
index 609831977..76ad2367c 100644
--- a/ide/vc2005/bitmap.vcproj
+++ b/ide/vc2005/bitmap.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/bitmap.exe"
+				OutputFile="../../test/bitmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/bitmapd.exe"
+				OutputFile="../../test/bitmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/bitmapd.exe"
+				OutputFile="../../test/bitmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/bitmap.exe"
+				OutputFile="../../test/bitmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/boxtype.vcproj b/ide/vc2005/boxtype.vcproj
index 6911e24dc..86418afb8 100644
--- a/ide/vc2005/boxtype.vcproj
+++ b/ide/vc2005/boxtype.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/boxtyped.exe"
+				OutputFile="../../test/boxtyped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/boxtype.exe"
+				OutputFile="../../test/boxtype.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/boxtyped.exe"
+				OutputFile="../../test/boxtyped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/boxtype.exe"
+				OutputFile="../../test/boxtype.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/browser.vcproj b/ide/vc2005/browser.vcproj
index aa597aa54..226836dfa 100644
--- a/ide/vc2005/browser.vcproj
+++ b/ide/vc2005/browser.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/browser.exe"
+				OutputFile="../../test/browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/browserd.exe"
+				OutputFile="../../test/browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/browserd.exe"
+				OutputFile="../../test/browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/browser.exe"
+				OutputFile="../../test/browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/button.vcproj b/ide/vc2005/button.vcproj
index bcf43cac6..70c049594 100644
--- a/ide/vc2005/button.vcproj
+++ b/ide/vc2005/button.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/buttond.exe"
+				OutputFile="../../test/buttond.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/button.exe"
+				OutputFile="../../test/button.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/buttond.exe"
+				OutputFile="../../test/buttond.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/button.exe"
+				OutputFile="../../test/button.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/buttons.vcproj b/ide/vc2005/buttons.vcproj
index 015ef43a5..822b2ed8a 100644
--- a/ide/vc2005/buttons.vcproj
+++ b/ide/vc2005/buttons.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/buttons.exe"
+				OutputFile="../../test/buttons.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/buttonsd.exe"
+				OutputFile="../../test/buttonsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/buttonsd.exe"
+				OutputFile="../../test/buttonsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/buttons.exe"
+				OutputFile="../../test/buttons.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/cairo_test.vcproj b/ide/vc2005/cairo_test.vcproj
index 374ef361b..77c7614af 100644
--- a/ide/vc2005/cairo_test.vcproj
+++ b/ide/vc2005/cairo_test.vcproj
@@ -49,7 +49,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Release/cairo_test.pch"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/cairo_test.exe"
+				OutputFile="../../test/cairo_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -141,7 +141,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/cairo_testd.exe"
+				OutputFile="../../test/cairo_testd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -236,7 +236,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/cairo_testd.exe"
+				OutputFile="../../test/cairo_testd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -333,7 +333,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Release/cairo_test.pch"
@@ -356,7 +356,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltk.lib comctl32.lib"
-				OutputFile="../test/cairo_test.exe"
+				OutputFile="../../test/cairo_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/checkers.vcproj b/ide/vc2005/checkers.vcproj
index a0ad4914e..3e822e190 100644
--- a/ide/vc2005/checkers.vcproj
+++ b/ide/vc2005/checkers.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/checkersd.exe"
+				OutputFile="../../test/checkersd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/checkers.exe"
+				OutputFile="../../test/checkers.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/checkersd.exe"
+				OutputFile="../../test/checkersd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/checkers.exe"
+				OutputFile="../../test/checkers.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/clock.vcproj b/ide/vc2005/clock.vcproj
index 9e22f98ec..587eaba70 100644
--- a/ide/vc2005/clock.vcproj
+++ b/ide/vc2005/clock.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/clockd.exe"
+				OutputFile="../../test/clockd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/clock.exe"
+				OutputFile="../../test/clock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/clockd.exe"
+				OutputFile="../../test/clockd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/clock.exe"
+				OutputFile="../../test/clock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/colbrowser.vcproj b/ide/vc2005/colbrowser.vcproj
index 88ad25a6d..b4937b752 100644
--- a/ide/vc2005/colbrowser.vcproj
+++ b/ide/vc2005/colbrowser.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/colbrowser.exe"
+				OutputFile="../../test/colbrowser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/colbrowserd.exe"
+				OutputFile="../../test/colbrowserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/colbrowserd.exe"
+				OutputFile="../../test/colbrowserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/colbrowser.exe"
+				OutputFile="../../test/colbrowser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/color_chooser.vcproj b/ide/vc2005/color_chooser.vcproj
index cc2bc4796..100aab7c9 100644
--- a/ide/vc2005/color_chooser.vcproj
+++ b/ide/vc2005/color_chooser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/color_chooserd.exe"
+				OutputFile="../../test/color_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -141,7 +141,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/color_chooser.exe"
+				OutputFile="../../test/color_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -258,7 +258,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/color_chooserd.exe"
+				OutputFile="../../test/color_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -327,7 +327,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -352,7 +352,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/color_chooser.exe"
+				OutputFile="../../test/color_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/cube.vcproj b/ide/vc2005/cube.vcproj
index 980c63c2f..f3c5cf40d 100644
--- a/ide/vc2005/cube.vcproj
+++ b/ide/vc2005/cube.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/cube.exe"
+				OutputFile="../../test/cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/cubed.exe"
+				OutputFile="../../test/cubed.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/cubed.exe"
+				OutputFile="../../test/cubed.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="../test/cube.exe"
+				OutputFile="../../test/cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/cursor.vcproj b/ide/vc2005/cursor.vcproj
index bbb0f88b5..72f5dfa2d 100644
--- a/ide/vc2005/cursor.vcproj
+++ b/ide/vc2005/cursor.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/cursord.exe"
+				OutputFile="../../test/cursord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/cursor.exe"
+				OutputFile="../../test/cursor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib comctl32.lib"
-				OutputFile="../test/cursord.exe"
+				OutputFile="../../test/cursord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/cursor.exe"
+				OutputFile="../../test/cursor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/curve.vcproj b/ide/vc2005/curve.vcproj
index 222f4fdd8..e16d6b729 100644
--- a/ide/vc2005/curve.vcproj
+++ b/ide/vc2005/curve.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/curved.exe"
+				OutputFile="../../test/curved.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/curve.exe"
+				OutputFile="../../test/curve.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/curved.exe"
+				OutputFile="../../test/curved.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/curve.exe"
+				OutputFile="../../test/curve.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/demo.vcproj b/ide/vc2005/demo.vcproj
index 434e0bfd3..6eaa15029 100644
--- a/ide/vc2005/demo.vcproj
+++ b/ide/vc2005/demo.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/demo.exe"
+				OutputFile="../../test/demo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/demod.exe"
+				OutputFile="../../test/demod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib comctl32.lib"
-				OutputFile="../test/demod.exe"
+				OutputFile="../../test/demod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/demo.exe"
+				OutputFile="../../test/demo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/doublebuffer.vcproj b/ide/vc2005/doublebuffer.vcproj
index 307138231..cc4c4ea40 100644
--- a/ide/vc2005/doublebuffer.vcproj
+++ b/ide/vc2005/doublebuffer.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/doublebufferd.exe"
+				OutputFile="../../test/doublebufferd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/doublebuffer.exe"
+				OutputFile="../../test/doublebuffer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/doublebufferd.exe"
+				OutputFile="../../test/doublebufferd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/doublebuffer.exe"
+				OutputFile="../../test/doublebuffer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/editor.vcproj b/ide/vc2005/editor.vcproj
index ceed8e816..50732394a 100644
--- a/ide/vc2005/editor.vcproj
+++ b/ide/vc2005/editor.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/editor.exe"
+				OutputFile="../../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -141,7 +141,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/editord.exe"
+				OutputFile="../../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -236,7 +236,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -262,7 +262,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib cairo.lib"
-				OutputFile="../test/editord.exe"
+				OutputFile="../../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -333,7 +333,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib cairo.lib"
-				OutputFile="../test/editor.exe"
+				OutputFile="../../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/fast_slow.vcproj b/ide/vc2005/fast_slow.vcproj
index b6d5d47bd..2e30a27e6 100644
--- a/ide/vc2005/fast_slow.vcproj
+++ b/ide/vc2005/fast_slow.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/fast_slowd.exe"
+				OutputFile="../../test/fast_slowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/fast_slow.exe"
+				OutputFile="../../test/fast_slow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/fast_slowd.exe"
+				OutputFile="../../test/fast_slowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/fast_slow.exe"
+				OutputFile="../../test/fast_slow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -477,6 +477,9 @@
 					CommandLine="cfluid $(InputName).fl"
 					Outputs="..\..\test\$(InputName).cxx"
 				/>
+			</FileConfiguration>
+		</File>
+	</Files>
 	<Globals>
     </Globals>
 </VisualStudioProject>
diff --git a/ide/vc2005/file_chooser.vcproj b/ide/vc2005/file_chooser.vcproj
index 226c4a9df..dbe03eabf 100644
--- a/ide/vc2005/file_chooser.vcproj
+++ b/ide/vc2005/file_chooser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/file_chooserd.exe"
+				OutputFile="../../test/file_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/file_chooser.exe"
+				OutputFile="../../test/file_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/file_chooserd.exe"
+				OutputFile="../../test/file_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib cairo.lib"
-				OutputFile="../test/file_chooser.exe"
+				OutputFile="../../test/file_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/fltk.lib.vcproj b/ide/vc2005/fltk.lib.vcproj
index 6ede771a7..82fb9e7cf 100644
--- a/ide/vc2005/fltk.lib.vcproj
+++ b/ide/vc2005/fltk.lib.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -114,7 +114,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1, _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/fltkdll.vcproj b/ide/vc2005/fltkdll.vcproj
index 2a33609c5..1d71b67e9 100644
--- a/ide/vc2005/fltkdll.vcproj
+++ b/ide/vc2005/fltkdll.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="fltkdll"
 	ProjectGUID="{F0B8F4BD-955D-43CB-980C-805364D04A25}"
 	RootNamespace="fltkdll"
@@ -41,7 +41,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\../test/fltkdll.tlb"
+				TypeLibraryName="../../test/fltkdll.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -49,7 +49,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..,..\..\zlib,..\..\png,..\..\jpeg"
+				AdditionalIncludeDirectories=".,..\..,..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -75,13 +75,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib"
-				OutputFile="fltkdll.dll"
+				OutputFile="../../test/fltkdll.dll"
 				Version="1.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile="fltkdll.pdb"
 				SubSystem="2"
-				ImportLibrary=".\../test/fltkdll.lib"
+				ImportLibrary="../../test/fltkdll.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -136,13 +136,13 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\../test/fltkdll.tlb"
+				TypeLibraryName="../../test/fltkdll.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..;..\..\zlib,..\..\png,..\..\jpeg"
+				AdditionalIncludeDirectories=".;../..;..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -167,15 +167,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="fltkdlld.dll"
+				AdditionalDependencies="opengl32.lib comctl32.lib"
+				OutputFile="../../test/fltkdlld.dll"
 				Version="1.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="fltkdlld.pdb"
 				SubSystem="2"
-				ImportLibrary=".\../test/fltkdlld.lib"
+				ImportLibrary="../../test/fltkdlld.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -230,13 +230,13 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\../test/fltkdll.tlb"
+				TypeLibraryName="../../test/fltkdll.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..;..\..\zlib,..\..\png,..\..\jpeg"
+				AdditionalIncludeDirectories=".;../..;..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -262,14 +262,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="fltkdlld.dll"
+				OutputFile="../../test/fltkdlld.dll"
 				Version="1.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="fltkdlld.pdb"
 				SubSystem="2"
-				ImportLibrary=".\../test/fltkdlld.lib"
+				ImportLibrary="../../test/fltkdlld.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -324,7 +324,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\../test/fltkdll.tlb"
+				TypeLibraryName="../../test/fltkdll.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -332,7 +332,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..,..\..\zlib,..\..\png,..\..\jpeg"
+				AdditionalIncludeDirectories=".,..\..,..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,13 +358,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="fltkdll.dll"
+				OutputFile="../../test/fltkdll.dll"
 				Version="1.0"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile="fltkdll.pdb"
 				SubSystem="2"
-				ImportLibrary=".\../test/fltkdll.lib"
+				ImportLibrary="../../test/fltkdll.lib"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/ide/vc2005/fltkforms.vcproj b/ide/vc2005/fltkforms.vcproj
index 1db380396..fb6fb8e7f 100644
--- a/ide/vc2005/fltkforms.vcproj
+++ b/ide/vc2005/fltkforms.vcproj
@@ -43,7 +43,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/fltkgl.vcproj b/ide/vc2005/fltkgl.vcproj
index 09439fdbb..2f80ed41a 100644
--- a/ide/vc2005/fltkgl.vcproj
+++ b/ide/vc2005/fltkgl.vcproj
@@ -43,7 +43,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/fltkimages.vcproj b/ide/vc2005/fltkimages.vcproj
index 5af87c9fc..a606ad96e 100644
--- a/ide/vc2005/fltkimages.vcproj
+++ b/ide/vc2005/fltkimages.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -114,7 +114,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/fluid.vcproj b/ide/vc2005/fluid.vcproj
index 40eff5206..98901ab7e 100644
--- a/ide/vc2005/fluid.vcproj
+++ b/ide/vc2005/fluid.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/fonts.vcproj b/ide/vc2005/fonts.vcproj
index 41e792655..6d715263b 100644
--- a/ide/vc2005/fonts.vcproj
+++ b/ide/vc2005/fonts.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/fontsd.exe"
+				OutputFile="../../test/fontsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/fonts.exe"
+				OutputFile="../../test/fonts.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/fontsd.exe"
+				OutputFile="../../test/fontsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/fonts.exe"
+				OutputFile="../../test/fonts.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/forms.vcproj b/ide/vc2005/forms.vcproj
index 5ae487680..2ee93ab5a 100644
--- a/ide/vc2005/forms.vcproj
+++ b/ide/vc2005/forms.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/formsd.exe"
+				OutputFile="../../test/formsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/forms.exe"
+				OutputFile="../../test/forms.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/formsd.exe"
+				OutputFile="../../test/formsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/forms.exe"
+				OutputFile="../../test/forms.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/fractals.vcproj b/ide/vc2005/fractals.vcproj
index 447589b60..16959a0cc 100644
--- a/ide/vc2005/fractals.vcproj
+++ b/ide/vc2005/fractals.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/fractalsd.exe"
+				OutputFile="../../test/fractalsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/fractals.exe"
+				OutputFile="../../test/fractals.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/fractalsd.exe"
+				OutputFile="../../test/fractalsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="../test/fractals.exe"
+				OutputFile="../../test/fractals.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/fullscreen.vcproj b/ide/vc2005/fullscreen.vcproj
index 9145f0512..42ee40cf1 100644
--- a/ide/vc2005/fullscreen.vcproj
+++ b/ide/vc2005/fullscreen.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib glu32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/fullscreend.exe"
+				OutputFile="../../test/fullscreend.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib glu32.lib fltk.lib comctl32.lib"
-				OutputFile="../test/fullscreen.exe"
+				OutputFile="../../test/fullscreen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib opengl32.lib glu32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/fullscreend.exe"
+				OutputFile="../../test/fullscreend.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib glu32.lib fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/fullscreen.exe"
+				OutputFile="../../test/fullscreen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/gl_overlay.vcproj b/ide/vc2005/gl_overlay.vcproj
index 846ec62af..b2c4c3e9b 100644
--- a/ide/vc2005/gl_overlay.vcproj
+++ b/ide/vc2005/gl_overlay.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/gl_overlay.exe"
+				OutputFile="../../test/gl_overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/gl_overlayd.exe"
+				OutputFile="../../test/gl_overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/gl_overlayd.exe"
+				OutputFile="../../test/gl_overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="../test/gl_overlay.exe"
+				OutputFile="../../test/gl_overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/glpuzzle.vcproj b/ide/vc2005/glpuzzle.vcproj
index f8a4ed403..f30ee63fc 100644
--- a/ide/vc2005/glpuzzle.vcproj
+++ b/ide/vc2005/glpuzzle.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/glpuzzled.exe"
+				OutputFile="../../test/glpuzzled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/glpuzzle.exe"
+				OutputFile="../../test/glpuzzle.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"
-				OutputFile="../test/glpuzzled.exe"
+				OutputFile="../../test/glpuzzled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"
-				OutputFile="../test/glpuzzle.exe"
+				OutputFile="../../test/glpuzzle.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/hello.vcproj b/ide/vc2005/hello.vcproj
index 906152e3b..3d517f507 100644
--- a/ide/vc2005/hello.vcproj
+++ b/ide/vc2005/hello.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/hellod.exe"
+				OutputFile="../../test/hellod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/hello.exe"
+				OutputFile="../../test/hello.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/hellod.exe"
+				OutputFile="../../test/hellod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/hello.exe"
+				OutputFile="../../test/hello.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/help.vcproj b/ide/vc2005/help.vcproj
index cb85e9611..30c3e3f75 100644
--- a/ide/vc2005/help.vcproj
+++ b/ide/vc2005/help.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/help.exe"
+				OutputFile="../../test/help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/helpd.exe"
+				OutputFile="../../test/helpd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib comctl32.lib"
-				OutputFile="../test/helpd.exe"
+				OutputFile="../../test/helpd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib cairo.lib"
-				OutputFile="../test/help.exe"
+				OutputFile="../../test/help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/iconize.vcproj b/ide/vc2005/iconize.vcproj
index aa4dfdeda..fc6bd9509 100644
--- a/ide/vc2005/iconize.vcproj
+++ b/ide/vc2005/iconize.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/iconized.exe"
+				OutputFile="../../test/iconized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/iconize.exe"
+				OutputFile="../../test/iconize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/iconized.exe"
+				OutputFile="../../test/iconized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/iconize.exe"
+				OutputFile="../../test/iconize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/image.vcproj b/ide/vc2005/image.vcproj
index 96b1d21c1..d91797576 100644
--- a/ide/vc2005/image.vcproj
+++ b/ide/vc2005/image.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/image.exe"
+				OutputFile="../../test/image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/imaged.exe"
+				OutputFile="../../test/imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/imaged.exe"
+				OutputFile="../../test/imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/image.exe"
+				OutputFile="../../test/image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/inactive.vcproj b/ide/vc2005/inactive.vcproj
index 6f138cd85..4e3d4f390 100644
--- a/ide/vc2005/inactive.vcproj
+++ b/ide/vc2005/inactive.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/inactived.exe"
+				OutputFile="../../test/inactived.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/inactive.exe"
+				OutputFile="../../test/inactive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/inactived.exe"
+				OutputFile="../../test/inactived.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/inactive.exe"
+				OutputFile="../../test/inactive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/input.vcproj b/ide/vc2005/input.vcproj
index 18f2ff230..3188a1f56 100644
--- a/ide/vc2005/input.vcproj
+++ b/ide/vc2005/input.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/input.exe"
+				OutputFile="../../test/input.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/inputd.exe"
+				OutputFile="../../test/inputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/inputd.exe"
+				OutputFile="../../test/inputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/input.exe"
+				OutputFile="../../test/input.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/input_choice.vcproj b/ide/vc2005/input_choice.vcproj
index e20f8b35d..4350b1881 100644
--- a/ide/vc2005/input_choice.vcproj
+++ b/ide/vc2005/input_choice.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/input_choiced.exe"
+				OutputFile="../../test/input_choiced.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/input_choice.exe"
+				OutputFile="../../test/input_choice.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/input_choiced.exe"
+				OutputFile="../../test/input_choiced.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/input_choice.exe"
+				OutputFile="../../test/input_choice.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/jpeg.vcproj b/ide/vc2005/jpeg.vcproj
index c953e7074..ae199bcb4 100644
--- a/ide/vc2005/jpeg.vcproj
+++ b/ide/vc2005/jpeg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -112,7 +112,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -254,7 +254,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/keyboard.vcproj b/ide/vc2005/keyboard.vcproj
index fb22e9d5f..786541fcc 100644
--- a/ide/vc2005/keyboard.vcproj
+++ b/ide/vc2005/keyboard.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/keyboard.exe"
+				OutputFile="../../test/keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/keyboardd.exe"
+				OutputFile="../../test/keyboardd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/keyboardd.exe"
+				OutputFile="../../test/keyboardd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/keyboard.exe"
+				OutputFile="../../test/keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/label.vcproj b/ide/vc2005/label.vcproj
index d53509121..a5e953f6d 100644
--- a/ide/vc2005/label.vcproj
+++ b/ide/vc2005/label.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/labeld.exe"
+				OutputFile="../../test/labeld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/label.exe"
+				OutputFile="../../test/label.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/labeld.exe"
+				OutputFile="../../test/labeld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/label.exe"
+				OutputFile="../../test/label.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/libpng.vcproj b/ide/vc2005/libpng.vcproj
index 7444d2d8c..0eac1a0c9 100644
--- a/ide/vc2005/libpng.vcproj
+++ b/ide/vc2005/libpng.vcproj
@@ -42,7 +42,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -254,7 +254,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/ide/vc2005/line_style.vcproj b/ide/vc2005/line_style.vcproj
index 8736b5170..54354d4e9 100644
--- a/ide/vc2005/line_style.vcproj
+++ b/ide/vc2005/line_style.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/line_style.exe"
+				OutputFile="../../test/line_style.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/line_styled.exe"
+				OutputFile="../../test/line_styled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/line_styled.exe"
+				OutputFile="../../test/line_styled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/line_style.exe"
+				OutputFile="../../test/line_style.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/mandelbrot.vcproj b/ide/vc2005/mandelbrot.vcproj
index 0add3748f..0adff7b95 100644
--- a/ide/vc2005/mandelbrot.vcproj
+++ b/ide/vc2005/mandelbrot.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/mandelbrotd.exe"
+				OutputFile="../../test/mandelbrotd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib fltk.lib comctl32.lib"
-				OutputFile="../test/mandelbrot.exe"
+				OutputFile="../../test/mandelbrot.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/mandelbrotd.exe"
+				OutputFile="../../test/mandelbrotd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glu32.lib opengl32.lib fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/mandelbrot.exe"
+				OutputFile="../../test/mandelbrot.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -487,7 +487,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -497,7 +497,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -507,7 +507,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -517,7 +517,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/ide/vc2005/menubar.vcproj b/ide/vc2005/menubar.vcproj
index 39040837d..9f167450a 100644
--- a/ide/vc2005/menubar.vcproj
+++ b/ide/vc2005/menubar.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/menubard.exe"
+				OutputFile="../../test/menubard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -141,7 +141,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/menubar.exe"
+				OutputFile="../../test/menubar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -258,7 +258,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/menubard.exe"
+				OutputFile="../../test/menubard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -327,7 +327,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -352,7 +352,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/menubar.exe"
+				OutputFile="../../test/menubar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/message.vcproj b/ide/vc2005/message.vcproj
index 7673095e8..9b54aadd5 100644
--- a/ide/vc2005/message.vcproj
+++ b/ide/vc2005/message.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/messaged.exe"
+				OutputFile="../../test/messaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/message.exe"
+				OutputFile="../../test/message.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/messaged.exe"
+				OutputFile="../../test/messaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/message.exe"
+				OutputFile="../../test/message.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/minimum.vcproj b/ide/vc2005/minimum.vcproj
index 7ec1d81d5..68557e104 100644
--- a/ide/vc2005/minimum.vcproj
+++ b/ide/vc2005/minimum.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/minimum.exe"
+				OutputFile="../../test/minimum.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/minimumd.exe"
+				OutputFile="../../test/minimumd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/minimumd.exe"
+				OutputFile="../../test/minimumd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/minimum.exe"
+				OutputFile="../../test/minimum.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/navigation.vcproj b/ide/vc2005/navigation.vcproj
index 908f02d54..456d964de 100644
--- a/ide/vc2005/navigation.vcproj
+++ b/ide/vc2005/navigation.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/navigation.exe"
+				OutputFile="../../test/navigation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/navigationd.exe"
+				OutputFile="../../test/navigationd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/navigationd.exe"
+				OutputFile="../../test/navigationd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/navigation.exe"
+				OutputFile="../../test/navigation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/output.vcproj b/ide/vc2005/output.vcproj
index 7b5ccebb7..7f06bbdc5 100644
--- a/ide/vc2005/output.vcproj
+++ b/ide/vc2005/output.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/output.exe"
+				OutputFile="../../test/output.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/outputd.exe"
+				OutputFile="../../test/outputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/outputd.exe"
+				OutputFile="../../test/outputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/output.exe"
+				OutputFile="../../test/output.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/overlay.vcproj b/ide/vc2005/overlay.vcproj
index 597f565db..2da279465 100644
--- a/ide/vc2005/overlay.vcproj
+++ b/ide/vc2005/overlay.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/overlayd.exe"
+				OutputFile="../../test/overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/overlay.exe"
+				OutputFile="../../test/overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/overlayd.exe"
+				OutputFile="../../test/overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/overlay.exe"
+				OutputFile="../../test/overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/pack.vcproj b/ide/vc2005/pack.vcproj
index 8799f619a..c0f9ea9d1 100644
--- a/ide/vc2005/pack.vcproj
+++ b/ide/vc2005/pack.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/packd.exe"
+				OutputFile="../../test/packd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/pack.exe"
+				OutputFile="../../test/pack.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/packd.exe"
+				OutputFile="../../test/packd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/pack.exe"
+				OutputFile="../../test/pack.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/pixmap.vcproj b/ide/vc2005/pixmap.vcproj
index 729811a14..10ae284be 100644
--- a/ide/vc2005/pixmap.vcproj
+++ b/ide/vc2005/pixmap.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/pixmap.exe"
+				OutputFile="../../test/pixmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/pixmapd.exe"
+				OutputFile="../../test/pixmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/pixmapd.exe"
+				OutputFile="../../test/pixmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/pixmap.exe"
+				OutputFile="../../test/pixmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/pixmap_browser.vcproj b/ide/vc2005/pixmap_browser.vcproj
index e6ad5ccbe..d25cabce6 100644
--- a/ide/vc2005/pixmap_browser.vcproj
+++ b/ide/vc2005/pixmap_browser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/pixmap_browserd.exe"
+				OutputFile="../../test/pixmap_browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../test/pixmap_browser.exe"
+				OutputFile="../../test/pixmap_browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib comctl32.lib"
-				OutputFile="../test/pixmap_browserd.exe"
+				OutputFile="../../test/pixmap_browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib cairo.lib"
-				OutputFile="../test/pixmap_browser.exe"
+				OutputFile="../../test/pixmap_browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/preferences.vcproj b/ide/vc2005/preferences.vcproj
index 1151ac94a..7a4885e41 100644
--- a/ide/vc2005/preferences.vcproj
+++ b/ide/vc2005/preferences.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/preferencesd.exe"
+				OutputFile="../../test/preferencesd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/preferences.exe"
+				OutputFile="../../test/preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/preferencesd.exe"
+				OutputFile="../../test/preferencesd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/preferences.exe"
+				OutputFile="../../test/preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/radio.vcproj b/ide/vc2005/radio.vcproj
index 86bb26538..afee699d2 100644
--- a/ide/vc2005/radio.vcproj
+++ b/ide/vc2005/radio.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/radio.exe"
+				OutputFile="../../test/radio.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/radiod.exe"
+				OutputFile="../../test/radiod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/radiod.exe"
+				OutputFile="../../test/radiod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/radio.exe"
+				OutputFile="../../test/radio.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -445,7 +445,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -455,7 +455,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -465,7 +465,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -475,7 +475,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/ide/vc2005/resize.vcproj b/ide/vc2005/resize.vcproj
index 32a8d9b9e..8db378e48 100644
--- a/ide/vc2005/resize.vcproj
+++ b/ide/vc2005/resize.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/resized.exe"
+				OutputFile="../../test/resized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/resize.exe"
+				OutputFile="../../test/resize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/resized.exe"
+				OutputFile="../../test/resized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/resize.exe"
+				OutputFile="../../test/resize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -445,7 +445,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -455,7 +455,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -465,7 +465,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -475,7 +475,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/ide/vc2005/resizebox.vcproj b/ide/vc2005/resizebox.vcproj
index 64ee860a8..b6b91ae50 100644
--- a/ide/vc2005/resizebox.vcproj
+++ b/ide/vc2005/resizebox.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/resizeboxd.exe"
+				OutputFile="../../test/resizeboxd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/resizebox.exe"
+				OutputFile="../../test/resizebox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/resizeboxd.exe"
+				OutputFile="../../test/resizeboxd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/resizebox.exe"
+				OutputFile="../../test/resizebox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/scroll.vcproj b/ide/vc2005/scroll.vcproj
index 47c3ea4db..fb55f30b9 100644
--- a/ide/vc2005/scroll.vcproj
+++ b/ide/vc2005/scroll.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/scroll.exe"
+				OutputFile="../../test/scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/scrolld.exe"
+				OutputFile="../../test/scrolld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/scrolld.exe"
+				OutputFile="../../test/scrolld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/scroll.exe"
+				OutputFile="../../test/scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/shape.vcproj b/ide/vc2005/shape.vcproj
index a31918eac..b940b4b38 100644
--- a/ide/vc2005/shape.vcproj
+++ b/ide/vc2005/shape.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib fltk.lib comctl32.lib"
-				OutputFile="../test/shape.exe"
+				OutputFile="../../test/shape.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/shaped.exe"
+				OutputFile="../../test/shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib opengl32.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/shaped.exe"
+				OutputFile="../../test/shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/shape.exe"
+				OutputFile="../../test/shape.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/subwindow.vcproj b/ide/vc2005/subwindow.vcproj
index 3d4118599..9ef26d0b4 100644
--- a/ide/vc2005/subwindow.vcproj
+++ b/ide/vc2005/subwindow.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/subwindow.exe"
+				OutputFile="../../test/subwindow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/subwindowd.exe"
+				OutputFile="../../test/subwindowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/subwindowd.exe"
+				OutputFile="../../test/subwindowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/subwindow.exe"
+				OutputFile="../../test/subwindow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/sudoku.vcproj b/ide/vc2005/sudoku.vcproj
index b6e072c4d..9fe3258cc 100644
--- a/ide/vc2005/sudoku.vcproj
+++ b/ide/vc2005/sudoku.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib winmm.lib comctl32.lib"
-				OutputFile="../test/sudokud.exe"
+				OutputFile="../../test/sudokud.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib winmm.lib comctl32.lib"
-				OutputFile="../test/sudoku.exe"
+				OutputFile="../../test/sudoku.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib winmm.lib comctl32.lib"
-				OutputFile="../test/sudokud.exe"
+				OutputFile="../../test/sudokud.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib winmm.lib comctl32.lib cairo.lib"
-				OutputFile="../test/sudoku.exe"
+				OutputFile="../../test/sudoku.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/symbols.vcproj b/ide/vc2005/symbols.vcproj
index 8155f0571..5561465c3 100644
--- a/ide/vc2005/symbols.vcproj
+++ b/ide/vc2005/symbols.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/symbolsd.exe"
+				OutputFile="../../test/symbolsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/symbols.exe"
+				OutputFile="../../test/symbols.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/symbolsd.exe"
+				OutputFile="../../test/symbolsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/symbols.exe"
+				OutputFile="../../test/symbols.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/tabs.vcproj b/ide/vc2005/tabs.vcproj
index fdfa02899..773dfeb51 100644
--- a/ide/vc2005/tabs.vcproj
+++ b/ide/vc2005/tabs.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/tabsd.exe"
+				OutputFile="../../test/tabsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -168,7 +168,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/tabs.exe"
+				OutputFile="../../test/tabs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/tabsd.exe"
+				OutputFile="../../test/tabsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -356,7 +356,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/tabs.exe"
+				OutputFile="../../test/tabs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -446,7 +446,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -456,7 +456,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create $(InputName).cxx and $(InputName).h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -466,7 +466,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -476,7 +476,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/ide/vc2005/threads.vcproj b/ide/vc2005/threads.vcproj
index 1844f9c88..44a471c2d 100644
--- a/ide/vc2005/threads.vcproj
+++ b/ide/vc2005/threads.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/threadsd.exe"
+				OutputFile="../../test/threadsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/threads.exe"
+				OutputFile="../../test/threads.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/threadsd.exe"
+				OutputFile="../../test/threadsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/threads.exe"
+				OutputFile="../../test/threads.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/tile.vcproj b/ide/vc2005/tile.vcproj
index 5d2ab8aa5..11a4d9275 100644
--- a/ide/vc2005/tile.vcproj
+++ b/ide/vc2005/tile.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/tile.exe"
+				OutputFile="../../test/tile.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/tiled.exe"
+				OutputFile="../../test/tiled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/tiled.exe"
+				OutputFile="../../test/tiled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/tile.exe"
+				OutputFile="../../test/tile.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/tiled_image.vcproj b/ide/vc2005/tiled_image.vcproj
index b016bad8c..dbeb8de7d 100644
--- a/ide/vc2005/tiled_image.vcproj
+++ b/ide/vc2005/tiled_image.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/tiled_imaged.exe"
+				OutputFile="../../test/tiled_imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/tiled_image.exe"
+				OutputFile="../../test/tiled_image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/tiled_imaged.exe"
+				OutputFile="../../test/tiled_imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/tiled_image.exe"
+				OutputFile="../../test/tiled_image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/utf8.vcproj b/ide/vc2005/utf8.vcproj
index 8f0ee0813..e9c3ce579 100644
--- a/ide/vc2005/utf8.vcproj
+++ b/ide/vc2005/utf8.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib imm32.lib"
-				OutputFile="../test/utf8d.exe"
+				OutputFile="../../test/utf8d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -168,7 +168,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib imm32.lib"
-				OutputFile="../test/utf8.exe"
+				OutputFile="../../test/utf8.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib imm32.lib"
-				OutputFile="../test/utf8d.exe"
+				OutputFile="../../test/utf8d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -356,7 +356,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib imm32.lib cairo.lib"
-				OutputFile="../test/utf8.exe"
+				OutputFile="../../test/utf8.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
diff --git a/ide/vc2005/valuators.vcproj b/ide/vc2005/valuators.vcproj
index d4ba8d262..d1d0c5d68 100644
--- a/ide/vc2005/valuators.vcproj
+++ b/ide/vc2005/valuators.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltkd.lib comctl32.lib"
-				OutputFile="../test/valuatorsd.exe"
+				OutputFile="../../test/valuatorsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib"
-				OutputFile="../test/valuators.exe"
+				OutputFile="../../test/valuators.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
-				OutputFile="../test/valuatorsd.exe"
+				OutputFile="../../test/valuatorsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"
-				OutputFile="../test/valuators.exe"
+				OutputFile="../../test/valuators.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -445,7 +445,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -455,7 +455,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -465,7 +465,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
 					CommandLine="cfluid /D $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -475,7 +475,7 @@
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
 					CommandLine="cfluid $(InputName).fl"
-					Outputs="../test/$(InputName).cxx"
+					Outputs="../../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/ide/vc2005/zlib.vcproj b/ide/vc2005/zlib.vcproj
index 999d287ee..768b78356 100644
--- a/ide/vc2005/zlib.vcproj
+++ b/ide/vc2005/zlib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="zlib"
 	ProjectGUID="{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}"
 	>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkzd.lib"
+				OutputFile="..\..\lib\fltkzd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -135,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkz.lib"
+				OutputFile="..\..\lib\fltkz.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -181,7 +181,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -253,7 +253,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
-- 
cgit v1.2.3