diff --git a/preprocess/Jamfile.v2 b/preprocess/Jamfile.v2
index ec8327e..ffd3614 100644
--- a/preprocess/Jamfile.v2
+++ b/preprocess/Jamfile.v2
@@ -4,6 +4,8 @@
 
 # Generates preprocessed files with wave.
 
+project : requirements <link>static <variant>release ;
+
 import feature ;
 import toolset ;
 
@@ -16,7 +18,7 @@ actions wave bind PHOENIX-LIMIT
   $(>[2]) -o- -DBOOST_PHOENIX_LIMIT=$(PHOENIX-LIMIT) --config-file wave.cfg $(>[1])
 }
 
-W = ../../../tools/wave/build//wave ;
+W = /boost/libs/wave/tool//wave ;
 
 make preprocess_phoenix_10
   : preprocess_phoenix.cpp $(W) : wave : <phoenix-limit>10
diff --git a/preprocess/preprocess_phoenix.cpp b/preprocess/preprocess_phoenix.cpp
index 4c8788d..4bb1a6a 100644
--- a/preprocess/preprocess_phoenix.cpp
+++ b/preprocess/preprocess_phoenix.cpp
@@ -3,14 +3,14 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/phoenix/version.hpp>
-#include <boost/phoenix/core.hpp>
-#include <boost/phoenix/bind.hpp>
-#include <boost/phoenix/function.hpp>
-#include <boost/phoenix/fusion.hpp>
-#include <boost/phoenix/object.hpp>
-#include <boost/phoenix/operator.hpp>
-#include <boost/phoenix/scope.hpp>
-#include <boost/phoenix/scope/dynamic.hpp>
-#include <boost/phoenix/statement.hpp>
-#include <boost/phoenix/stl.hpp>
+#include "../include/boost/phoenix/version.hpp"
+#include "../include/boost/phoenix/core.hpp"
+#include "../include/boost/phoenix/bind.hpp"
+#include "../include/boost/phoenix/function.hpp"
+#include "../include/boost/phoenix/fusion.hpp"
+#include "../include/boost/phoenix/object.hpp"
+#include "../include/boost/phoenix/operator.hpp"
+#include "../include/boost/phoenix/scope.hpp"
+#include "../include/boost/phoenix/scope/dynamic.hpp"
+#include "../include/boost/phoenix/statement.hpp"
+#include "../include/boost/phoenix/stl.hpp"
diff --git a/preprocess/wave-msvc-10.0.cfg b/preprocess/wave-msvc-10.0.cfg
index e938e4d..dd63971 100644
--- a/preprocess/wave-msvc-10.0.cfg
+++ b/preprocess/wave-msvc-10.0.cfg
@@ -1,5 +1,6 @@
 -DBOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES
 -DBOOST_PHOENIX_CREATE_PREPROCESSED_FILES
+-S../include
 -S../../..
 -S"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include"
 -S.
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index 902d265..c4a13d8 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -1,8 +1,7 @@
 -DBOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES
 -DBOOST_PHOENIX_CREATE_PREPROCESSED_FILES
--S/home/thomas/programming/boost/trunk
--S/home/heller/programming/boost/trunk
--S/home/cip/ce/sithhell/programming/boost
+-S../include
+-S../../..
 -S/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/include
 -S/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.1/include
 -S/usr/lib/gcc/i486-linux-gnu/4.4.5/include