Fix the gch usage quirk with a silly hack and a load of small changes

130 files changed, 133 insertions, 122 deletions

diff --git a/project2/basics/Jamfile.jam b/project2/basics/Jamfile.jam
index 66ec12c..b276ba1 100644
--- a/project2/basics/Jamfile.jam
+++ b/project2/basics/Jamfile.jam
@@ -13,6 +13,7 @@ cpp-pch pch : pch.hpp :
 lib p2basics :
 	[ glob-tree *.cpp ]
 	:
+	<include>.
 	<include>../../libmisc
 	<library>glibmm
 	<library>boost_filesystem
diff --git a/project2/basics/functions/dates.cpp b/project2/basics/functions/dates.cpp
index 0c795c2..f2dcb20 100644
--- a/project2/basics/functions/dates.cpp
+++ b/project2/basics/functions/dates.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <variables.h>
 #include <scriptLoader.h>
 #include <scriptStorage.h>
diff --git a/project2/basics/functions/strings.cpp b/project2/basics/functions/strings.cpp
index f98c6a0..d4ba7b7 100644
--- a/project2/basics/functions/strings.cpp
+++ b/project2/basics/functions/strings.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <variables.h>
 #include <scriptLoader.h>
 #include <scriptStorage.h>
diff --git a/project2/basics/tests/compoundTest.cpp b/project2/basics/tests/compoundTest.cpp
index a55fc9a..b361db5 100644
--- a/project2/basics/tests/compoundTest.cpp
+++ b/project2/basics/tests/compoundTest.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "compoundTest.h"
 #include <scriptLoader.h>
 #include <boost/foreach.hpp>
diff --git a/project2/basics/tests/equals.cpp b/project2/basics/tests/equals.cpp
index b3d0e7e..ba8c695 100644
--- a/project2/basics/tests/equals.cpp
+++ b/project2/basics/tests/equals.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <test.h>
 #include <scriptLoader.h>
 #include <rowProcessor.h>
diff --git a/project2/basics/tests/isdistinct.cpp b/project2/basics/tests/isdistinct.cpp
index 923924e..ab7bf1b 100644
--- a/project2/basics/tests/isdistinct.cpp
+++ b/project2/basics/tests/isdistinct.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <test.h>
 #include <scriptLoader.h>
 #include <iHaveParameters.h>
diff --git a/project2/basics/tests/isuniq.cpp b/project2/basics/tests/isuniq.cpp
index 52c5b3b..c14ea84 100644
--- a/project2/basics/tests/isuniq.cpp
+++ b/project2/basics/tests/isuniq.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <test.h>
 #include <scriptLoader.h>
 #include <iHaveParameters.h>
diff --git a/project2/basics/tests/validDateCheck.cpp b/project2/basics/tests/validDateCheck.cpp
index 6d60c97..8dffd9d 100644
--- a/project2/basics/tests/validDateCheck.cpp
+++ b/project2/basics/tests/validDateCheck.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <logger.h>
 #include <scriptLoader.h>
 #include <commonObjects.h>
diff --git a/project2/cgi/Jamfile.jam b/project2/cgi/Jamfile.jam
index 6d9021e..cf6e55c 100644
--- a/project2/cgi/Jamfile.jam
+++ b/project2/cgi/Jamfile.jam
@@ -20,6 +20,7 @@ lib p2cgicommon :
 	pch
 	[ glob cgi*.cpp ]
 	:
+	<include>.
 	<include>../libmisc
 	<library>cgicc
 	<library>glibmm
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 9f72b31..0022a88 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiResult.h"
 #include <cgicc/Cgicc.h>
diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp
index 58b7e71..2edbdef 100644
--- a/project2/cgi/cgiCommon.cpp
+++ b/project2/cgi/cgiCommon.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiCommon.h"
 #include "logger.h"
 #include <glibmm/exception.h>
diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp
index 916dfc1..a7f7557 100644
--- a/project2/cgi/cgiContentNegotiate.cpp
+++ b/project2/cgi/cgiContentNegotiate.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include <boost/tokenizer.hpp>
 #include <boost/bind.hpp>
diff --git a/project2/cgi/cgiEnvironment.cpp b/project2/cgi/cgiEnvironment.cpp
index 7cd7cd5..0276d57 100644
--- a/project2/cgi/cgiEnvironment.cpp
+++ b/project2/cgi/cgiEnvironment.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/project2/cgi/cgiHttpHeader.cpp b/project2/cgi/cgiHttpHeader.cpp
index 6b7a736..28dcec9 100644
--- a/project2/cgi/cgiHttpHeader.cpp
+++ b/project2/cgi/cgiHttpHeader.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiHttpHeader.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp
index 742924c..089b94f 100644
--- a/project2/cgi/cgiProgRouter.cpp
+++ b/project2/cgi/cgiProgRouter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include "cgiEnvironment.h"
diff --git a/project2/cgi/cgiRequestID.cpp b/project2/cgi/cgiRequestID.cpp
index 1d674f8..da8ad6a 100644
--- a/project2/cgi/cgiRequestID.cpp
+++ b/project2/cgi/cgiRequestID.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <variables.h>
 #include "cgiEnvironment.h"
 #include <scriptLoader.h>
diff --git a/project2/cgi/cgiResultStatic.cpp b/project2/cgi/cgiResultStatic.cpp
index 5d8e442..b5fecd7 100644
--- a/project2/cgi/cgiResultStatic.cpp
+++ b/project2/cgi/cgiResultStatic.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <time.h>
 #include "cgiResult.h"
 
diff --git a/project2/cgi/cgiResultWritable.cpp b/project2/cgi/cgiResultWritable.cpp
index 981f70c..ea17d3b 100644
--- a/project2/cgi/cgiResultWritable.cpp
+++ b/project2/cgi/cgiResultWritable.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiResult.h"
 
 class WritableToCgiResult : public TransformImpl<WritableContent, CgiResult> {
diff --git a/project2/cgi/cgiStageCacheHit.cpp b/project2/cgi/cgiStageCacheHit.cpp
index 5d094ce..d398e8f 100644
--- a/project2/cgi/cgiStageCacheHit.cpp
+++ b/project2/cgi/cgiStageCacheHit.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageCustomError.cpp b/project2/cgi/cgiStageCustomError.cpp
index 1e10c71..56739fd 100644
--- a/project2/cgi/cgiStageCustomError.cpp
+++ b/project2/cgi/cgiStageCustomError.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageCustomNotFound.cpp b/project2/cgi/cgiStageCustomNotFound.cpp
index 81394be..872da77 100644
--- a/project2/cgi/cgiStageCustomNotFound.cpp
+++ b/project2/cgi/cgiStageCustomNotFound.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index 9589c14..b8f0b4b 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiHttpHeader.h"
 #include "logger.h"
diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp
index 15e0af8..5b68bc6 100644
--- a/project2/cgi/cgiStageDefaultNotFound.cpp
+++ b/project2/cgi/cgiStageDefaultNotFound.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageFail.cpp b/project2/cgi/cgiStageFail.cpp
index b75c183..019ab8e 100644
--- a/project2/cgi/cgiStageFail.cpp
+++ b/project2/cgi/cgiStageFail.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/lexical_cast.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp
index 03a4bcd..1fe4820 100644
--- a/project2/cgi/cgiStageInitial.cpp
+++ b/project2/cgi/cgiStageInitial.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "exceptions.h"
diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp
index fb2f3d8..90299fe 100644
--- a/project2/cgi/cgiStagePresent.cpp
+++ b/project2/cgi/cgiStagePresent.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageRedirect.cpp b/project2/cgi/cgiStageRedirect.cpp
index c7f8a8b..4a4cd02 100644
--- a/project2/cgi/cgiStageRedirect.cpp
+++ b/project2/cgi/cgiStageRedirect.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp
index 8266072..8fa06bf 100644
--- a/project2/cgi/cgiStageRequest.cpp
+++ b/project2/cgi/cgiStageRequest.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiUriParam.cpp b/project2/cgi/cgiUriParam.cpp
index fe74038..c65119e 100644
--- a/project2/cgi/cgiUriParam.cpp
+++ b/project2/cgi/cgiUriParam.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cgiEnvironment.h"
 #include <variables.h>
 #include <scriptLoader.h>
diff --git a/project2/common/Jamfile.jam b/project2/common/Jamfile.jam
index 96f8137..2b58409 100644
--- a/project2/common/Jamfile.jam
+++ b/project2/common/Jamfile.jam
@@ -16,6 +16,7 @@ lib p2common :
 	pch
 	[ glob-tree *.cpp ]
 	:
+	<include>.
 	<library>glibmm 
 	<library>dl
 	<library>boost_system
diff --git a/project2/common/appEngine.cpp b/project2/common/appEngine.cpp
index e1b938b..c6d3e92 100644
--- a/project2/common/appEngine.cpp
+++ b/project2/common/appEngine.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "appEngine.h"
 #include "logger.h"
 #include "presenter.h"
diff --git a/project2/common/cache.cpp b/project2/common/cache.cpp
index eb342c5..9be5845 100644
--- a/project2/common/cache.cpp
+++ b/project2/common/cache.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cache.h"
 #include "rowSet.h"
 #include "rowProcessor.h"
diff --git a/project2/common/check.cpp b/project2/common/check.cpp
index 339a413..21d17cf 100644
--- a/project2/common/check.cpp
+++ b/project2/common/check.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "check.h"
 #include "scriptLoader.h"
 #include "scriptStorage.h"
diff --git a/project2/common/checkHost.cpp b/project2/common/checkHost.cpp
index 2200c75..49533a9 100644
--- a/project2/common/checkHost.cpp
+++ b/project2/common/checkHost.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "checkHost.h"
 #include "appEngine.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/columns.cpp b/project2/common/columns.cpp
index c3f8e7e..198dd96 100644
--- a/project2/common/columns.cpp
+++ b/project2/common/columns.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "columns.h"
 #include "scripts.h"
 
diff --git a/project2/common/commonObjects.cpp b/project2/common/commonObjects.cpp
index ca5cec3..9b45baa 100644
--- a/project2/common/commonObjects.cpp
+++ b/project2/common/commonObjects.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "commonObjects.h"
 #include "safeMapFind.h"
 #include "appEngine.h"
diff --git a/project2/common/dataSource.cpp b/project2/common/dataSource.cpp
index d00ebf1..133f64d 100644
--- a/project2/common/dataSource.cpp
+++ b/project2/common/dataSource.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "dataSource.h"
 #include "scripts.h"
 
diff --git a/project2/common/definedColumns.cpp b/project2/common/definedColumns.cpp
index a0c86d2..160b0bc 100644
--- a/project2/common/definedColumns.cpp
+++ b/project2/common/definedColumns.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "definedColumns.h"
 #include "scripts.h"
 #include <boost/function.hpp>
diff --git a/project2/common/environment.cpp b/project2/common/environment.cpp
index 71327f8..7765a06 100644
--- a/project2/common/environment.cpp
+++ b/project2/common/environment.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "environment.h"
 #include "optionsSource.h"
 #include "logger.h"
diff --git a/project2/common/exceptions.cpp b/project2/common/exceptions.cpp
index b6dd5ba..9be2710 100644
--- a/project2/common/exceptions.cpp
+++ b/project2/common/exceptions.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "exceptions.h"
 #include "logger.h"
 #include <stdlib.h>
diff --git a/project2/common/fileStrmVarWriter.cpp b/project2/common/fileStrmVarWriter.cpp
index f3cf666..caaf908 100644
--- a/project2/common/fileStrmVarWriter.cpp
+++ b/project2/common/fileStrmVarWriter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "fileStrmVarWriter.h"
 #include "rowSet.h"
 #include "scriptLoader.h"
diff --git a/project2/common/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp
index 37e478c..f880944 100644
--- a/project2/common/iHaveParameters.cpp
+++ b/project2/common/iHaveParameters.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "iHaveParameters.h"
 #include "exceptions.h"
 #include "safeMapFind.h"
diff --git a/project2/common/iHaveSubTasks.cpp b/project2/common/iHaveSubTasks.cpp
index 5c9d801..78868aa 100644
--- a/project2/common/iHaveSubTasks.cpp
+++ b/project2/common/iHaveSubTasks.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "iHaveSubTasks.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/if.cpp b/project2/common/if.cpp
index cc2f216..c7f790e 100644
--- a/project2/common/if.cpp
+++ b/project2/common/if.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "if.h"
 #include "logger.h"
 #include "scriptLoader.h"
diff --git a/project2/common/iterate.cpp b/project2/common/iterate.cpp
index 20694a3..037261d 100644
--- a/project2/common/iterate.cpp
+++ b/project2/common/iterate.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "iterate.h"
 #include "logger.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/library.cpp b/project2/common/library.cpp
index 2794d3b..4762211 100644
--- a/project2/common/library.cpp
+++ b/project2/common/library.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <dlfcn.h>
 #include "scriptStorage.h"
 #include "exceptions.h"
diff --git a/project2/common/logger.cpp b/project2/common/logger.cpp
index 7f8981f..8140155 100644
--- a/project2/common/logger.cpp
+++ b/project2/common/logger.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #define SYSLOG_NAMES 1 // Enables the definition of names in syslog.h
 
 #include "logger.h"
diff --git a/project2/common/memoryCache.cpp b/project2/common/memoryCache.cpp
index 0ddd018..0a4f53f 100644
--- a/project2/common/memoryCache.cpp
+++ b/project2/common/memoryCache.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "logger.h"
 #include "cache.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/noOutputExecute.cpp b/project2/common/noOutputExecute.cpp
index 52a4982..02c8f71 100644
--- a/project2/common/noOutputExecute.cpp
+++ b/project2/common/noOutputExecute.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "noOutputExecute.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/options.cpp b/project2/common/options.cpp
index 37b3f06..5c79163 100644
--- a/project2/common/options.cpp
+++ b/project2/common/options.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "options.h"
 #include "environment.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/pch.hpp b/project2/common/pch.hpp
index 3319b62..d750ce4 100644
--- a/project2/common/pch.hpp
+++ b/project2/common/pch.hpp
@@ -9,6 +9,9 @@
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>
 #include <boost/intrusive_ptr.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
 #include "options.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/variant.hpp>
@@ -25,7 +28,7 @@
 #include <vector>
 #include "scriptStorage.h"
 #include "scriptLoader.h"
-//#include "plugable.h"
+#include "plugable.h"
 #include "variables.h"
 #include "variableType.h"
 #include "sourceObject.h"
diff --git a/project2/common/presenter.cpp b/project2/common/presenter.cpp
index e273471..1e5bbf2 100644
--- a/project2/common/presenter.cpp
+++ b/project2/common/presenter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "presenter.h"
 #include "dataSource.h"
 #include "appEngine.h"
diff --git a/project2/common/rowProcessor.cpp b/project2/common/rowProcessor.cpp
index aa2a56a..4e3bf1d 100644
--- a/project2/common/rowProcessor.cpp
+++ b/project2/common/rowProcessor.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "rowProcessor.h"
 #include "logger.h"
 #include "commonObjects.h"
diff --git a/project2/common/rowSet.cpp b/project2/common/rowSet.cpp
index 99aed50..0378b51 100644
--- a/project2/common/rowSet.cpp
+++ b/project2/common/rowSet.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "rowSet.h"
 #include "commonObjects.h"
 #include "scopeObject.h"
diff --git a/project2/common/rowView.cpp b/project2/common/rowView.cpp
index e8ad53f..c0e5cae 100644
--- a/project2/common/rowView.cpp
+++ b/project2/common/rowView.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "rowView.h"
 #include "presenter.h"
 #include "scopeObject.h"
diff --git a/project2/common/scriptLoader.cpp b/project2/common/scriptLoader.cpp
index 66cf2aa..ab02f02 100644
--- a/project2/common/scriptLoader.cpp
+++ b/project2/common/scriptLoader.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "scopeObject.h"
 #include "scriptLoader.h"
 #include "scriptStorage.h"
diff --git a/project2/common/session.cpp b/project2/common/session.cpp
index 3fdd2af..7464a21 100644
--- a/project2/common/session.cpp
+++ b/project2/common/session.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "session.h"
 #include "safeMapFind.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/sessionClearTask.cpp b/project2/common/sessionClearTask.cpp
index 7430d37..b3b1000 100644
--- a/project2/common/sessionClearTask.cpp
+++ b/project2/common/sessionClearTask.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/foreach.hpp>
 #include "scriptLoader.h"
 #include "sessionClearTask.h"
diff --git a/project2/common/sessionContainer.cpp b/project2/common/sessionContainer.cpp
index 4347476..8caa351 100644
--- a/project2/common/sessionContainer.cpp
+++ b/project2/common/sessionContainer.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sessionContainer.h"
 #include "environment.h"
 
diff --git a/project2/common/sessionSetTask.cpp b/project2/common/sessionSetTask.cpp
index 7efdd53..aca5b26 100644
--- a/project2/common/sessionSetTask.cpp
+++ b/project2/common/sessionSetTask.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/foreach.hpp>
 #include "scriptLoader.h"
 #include "sessionSetTask.h"
diff --git a/project2/common/singleton.cpp b/project2/common/singleton.cpp
index d056001..0aaf5f7 100644
--- a/project2/common/singleton.cpp
+++ b/project2/common/singleton.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "view.h"
 #include "iHaveParameters.h"
 #include "presenter.h"
diff --git a/project2/common/sourceObject.cpp b/project2/common/sourceObject.cpp
index f63a727..03f06b5 100644
--- a/project2/common/sourceObject.cpp
+++ b/project2/common/sourceObject.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sourceObject.h"
 #include "exceptions.h"
 #include "safeMapFind.h"
diff --git a/project2/common/structExceptHandling.cpp b/project2/common/structExceptHandling.cpp
index b2c7c83..0881d6d 100644
--- a/project2/common/structExceptHandling.cpp
+++ b/project2/common/structExceptHandling.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "structExceptHandling.h"
 #include "scriptLoader.h"
 #include "scriptStorage.h"
diff --git a/project2/common/task.cpp b/project2/common/task.cpp
index c285d3f..c4275f8 100644
--- a/project2/common/task.cpp
+++ b/project2/common/task.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "task.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/taskHost.cpp b/project2/common/taskHost.cpp
index 322db35..cbfe7c3 100644
--- a/project2/common/taskHost.cpp
+++ b/project2/common/taskHost.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "taskHost.h"
 #include "noOutputExecute.h"
 #include "dataSource.h"
diff --git a/project2/common/transform.cpp b/project2/common/transform.cpp
index 7e8504c..fb92486 100644
--- a/project2/common/transform.cpp
+++ b/project2/common/transform.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "transform.h"
 #include "logger.h"
 #include "ostreamWrapper.h"
diff --git a/project2/common/variableConvert.cpp b/project2/common/variableConvert.cpp
index 69082de..737a856 100644
--- a/project2/common/variableConvert.cpp
+++ b/project2/common/variableConvert.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "variables.h"
 #include "exceptions.h"
 #include <boost/lexical_cast.hpp>
diff --git a/project2/common/variableType.cpp b/project2/common/variableType.cpp
index 25ce800..775b2fd 100644
--- a/project2/common/variableType.cpp
+++ b/project2/common/variableType.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "variableType.h"
 #include "logger.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/project2/common/variables.cpp b/project2/common/variables.cpp
index a6619b1..6f62dc1 100644
--- a/project2/common/variables.cpp
+++ b/project2/common/variables.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "logger.h"
 #include "variables.h"
 #include "variables/fixed.h"
diff --git a/project2/common/variables/config.cpp b/project2/common/variables/config.cpp
index 5b38713..51759d5 100644
--- a/project2/common/variables/config.cpp
+++ b/project2/common/variables/config.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/localparam.cpp b/project2/common/variables/localparam.cpp
index 2f09b08..1b789a7 100644
--- a/project2/common/variables/localparam.cpp
+++ b/project2/common/variables/localparam.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/lookup.cpp b/project2/common/variables/lookup.cpp
index 19884e5..2a96338 100644
--- a/project2/common/variables/lookup.cpp
+++ b/project2/common/variables/lookup.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../variables.h"
 #include <safeMapFind.h>
 #include "../logger.h"
diff --git a/project2/common/variables/param.cpp b/project2/common/variables/param.cpp
index c985868..7292b0a 100644
--- a/project2/common/variables/param.cpp
+++ b/project2/common/variables/param.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/session.cpp b/project2/common/variables/session.cpp
index 2e26a12..fc33d8e 100644
--- a/project2/common/variables/session.cpp
+++ b/project2/common/variables/session.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/view.cpp b/project2/common/view.cpp
index ddbf157..30a6491 100644
--- a/project2/common/view.cpp
+++ b/project2/common/view.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "view.h"
 
 View::View(ScriptNodePtr p) :
diff --git a/project2/common/viewHost.cpp b/project2/common/viewHost.cpp
index 4b6a6af..04e0d88 100644
--- a/project2/common/viewHost.cpp
+++ b/project2/common/viewHost.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "viewHost.h"
 #include "commonObjects.h"
 #include "transform.h"
diff --git a/project2/console/Jamfile.jam b/project2/console/Jamfile.jam
index b3b60a1..fc5d50b 100644
--- a/project2/console/Jamfile.jam
+++ b/project2/console/Jamfile.jam
@@ -11,6 +11,7 @@ exe p2console :
 	pch
 	[ glob *.cpp ]
 	:
+	<include>.
 	<library>..//p2parts
 	<library>../common//p2common
 	<include>../../libmisc
diff --git a/project2/console/claOptions.cpp b/project2/console/claOptions.cpp
index be60144..4660134 100644
--- a/project2/console/claOptions.cpp
+++ b/project2/console/claOptions.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <stdio.h>
 #include <boost/foreach.hpp>
 #include "../common/optionsSource.h"
diff --git a/project2/console/consoleAppEngine.cpp b/project2/console/consoleAppEngine.cpp
index 114061d..044544c 100644
--- a/project2/console/consoleAppEngine.cpp
+++ b/project2/console/consoleAppEngine.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <glibmm/exception.h>
 #include <cxxabi.h>
 #include "consoleAppEngine.h"
diff --git a/project2/console/consoleEnvironment.cpp b/project2/console/consoleEnvironment.cpp
index ca93d49..414bbed 100644
--- a/project2/console/consoleEnvironment.cpp
+++ b/project2/console/consoleEnvironment.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "consoleEnvironment.h"
 #include <sys/utsname.h>
 #include <errno.h>
diff --git a/project2/console/consolePresenter.cpp b/project2/console/consolePresenter.cpp
index a67155f..52bface 100644
--- a/project2/console/consolePresenter.cpp
+++ b/project2/console/consolePresenter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <stdio.h>
 #include "consolePresenter.h"
 
diff --git a/project2/console/p2consoleMain.cpp b/project2/console/p2consoleMain.cpp
index aef61fd..1643eda 100644
--- a/project2/console/p2consoleMain.cpp
+++ b/project2/console/p2consoleMain.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "consoleEnvironment.h"
 #include "consoleAppEngine.h"
 #include "scriptLoader.h"
diff --git a/project2/files/Jamfile.jam b/project2/files/Jamfile.jam
index 66d55f0..91272e0 100644
--- a/project2/files/Jamfile.jam
+++ b/project2/files/Jamfile.jam
@@ -14,6 +14,7 @@ lib p2files :
 	pch
 	[ glob-tree *.cpp ]
 	:
+	<include>.
 	<include>../libmisc
 	<library>glibmm
 	<library>boost_filesystem
diff --git a/project2/files/fileStream.cpp b/project2/files/fileStream.cpp
index 99eb302..762e39b 100644
--- a/project2/files/fileStream.cpp
+++ b/project2/files/fileStream.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "logger.h"
 #include <scopeObject.h>
 #include "stream.h"
diff --git a/project2/files/fsFilterMaxDepth.cpp b/project2/files/fsFilterMaxDepth.cpp
index 76068da..f0d685e 100644
--- a/project2/files/fsFilterMaxDepth.cpp
+++ b/project2/files/fsFilterMaxDepth.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "fsRows.h"
 #include "scripts.h"
 #include <boost/lexical_cast.hpp>
diff --git a/project2/files/fsFilterName.cpp b/project2/files/fsFilterName.cpp
index ca0bd72..cc1104f 100644
--- a/project2/files/fsFilterName.cpp
+++ b/project2/files/fsFilterName.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "fsRows.h"
 #include "scripts.h"
 
diff --git a/project2/files/fsFilterType.cpp b/project2/files/fsFilterType.cpp
index 959a6e8..0d0b27b 100644
--- a/project2/files/fsFilterType.cpp
+++ b/project2/files/fsFilterType.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "fsRows.h"
 #include "scripts.h"
 
diff --git a/project2/files/fsRows.cpp b/project2/files/fsRows.cpp
index 87e8c97..e56f243 100644
--- a/project2/files/fsRows.cpp
+++ b/project2/files/fsRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "fsRows.h"
 #include "logger.h"
 #include "scriptLoader.h"
diff --git a/project2/files/functions/pwd.cpp b/project2/files/functions/pwd.cpp
index 519038a..ce7b068 100644
--- a/project2/files/functions/pwd.cpp
+++ b/project2/files/functions/pwd.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <variables.h>
 #include <scriptLoader.h>
 #include <scripts.h>
diff --git a/project2/files/optionsSource.cpp b/project2/files/optionsSource.cpp
index 46d9cc1..db79b98 100644
--- a/project2/files/optionsSource.cpp
+++ b/project2/files/optionsSource.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <sys/stat.h>
 #include "optionsSource.h"
 #include <glibmm/iochannel.h>
diff --git a/project2/json/Jamfile.jam b/project2/json/Jamfile.jam
index e9ae7b5..7453a04 100644
--- a/project2/json/Jamfile.jam
+++ b/project2/json/Jamfile.jam
@@ -13,6 +13,7 @@ cpp-pch pch : pch.hpp :
 lib p2json :
 	pch [ glob *.cpp ]
 	:
+	<include>.
 	<include>../libmisc
 	<library>glibmm
 	<library>../common//p2common
diff --git a/project2/json/conversion.cpp b/project2/json/conversion.cpp
index 0f5a2fa..1fae0d3 100644
--- a/project2/json/conversion.cpp
+++ b/project2/json/conversion.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "conversion.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
 
diff --git a/project2/json/couchSession.cpp b/project2/json/couchSession.cpp
index b4b3f6b..01e23ba 100644
--- a/project2/json/couchSession.cpp
+++ b/project2/json/couchSession.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "curlHelper.h"
 #include "safeMapFind.h"
 #include "exceptions.h"
diff --git a/project2/json/parse.cpp b/project2/json/parse.cpp
index d9da9e9..cb41dd2 100644
--- a/project2/json/parse.cpp
+++ b/project2/json/parse.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "json.h"
 #include <stdio.h>
 
diff --git a/project2/json/presenter-p.cpp b/project2/json/presenter-p.cpp
index b501a8a..3cb5bf8 100644
--- a/project2/json/presenter-p.cpp
+++ b/project2/json/presenter-p.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "presenter.h"
 
 class Json_P_Presenter : public JsonPresenter {
diff --git a/project2/json/presenter.cpp b/project2/json/presenter.cpp
index 40859e2..111ae5c 100644
--- a/project2/json/presenter.cpp
+++ b/project2/json/presenter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "../common/presenter.h"
 #include "json.h"
 #include "conversion.h"
diff --git a/project2/json/serialize.cpp b/project2/json/serialize.cpp
index 390d45e..a1ba1f6 100644
--- a/project2/json/serialize.cpp
+++ b/project2/json/serialize.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "json.h"
 #include <stdio.h>
 #include <boost/foreach.hpp>
diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
index dffab25..8b075fc 100644
--- a/project2/sql/Jamfile.jam
+++ b/project2/sql/Jamfile.jam
@@ -46,6 +46,7 @@ lib p2sql :
 	[ glob *.cpp : sql-mod*.cpp ]
 	../../libdbpp//dbpp
 	:
+	<include>.
 	<odbc>yes:<library>sql-modODBC
 	<pq>yes:<library>sql-modPQ
 	<mysql>yes:<library>sql-modMySQL
diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp
index 19420db..691daab 100644
--- a/project2/sql/rdbmsDataSource.cpp
+++ b/project2/sql/rdbmsDataSource.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "rdbmsDataSource.h"
 #include "connectionLoader.h"
 #include <sys/utsname.h>
diff --git a/project2/sql/sqlBulkLoad.cpp b/project2/sql/sqlBulkLoad.cpp
index 73cd5e0..a8283b9 100644
--- a/project2/sql/sqlBulkLoad.cpp
+++ b/project2/sql/sqlBulkLoad.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "task.h"
 #include <commonObjects.h>
 #include "rdbmsDataSource.h"
diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp
index bb61969..ba8dfb5 100644
--- a/project2/sql/sqlCache.cpp
+++ b/project2/sql/sqlCache.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cache.h"
 #include "sqlVariableBinder.h"
 #include "sqlHandleAsVariableType.h"
diff --git a/project2/sql/sqlHandleAsVariableType.cpp b/project2/sql/sqlHandleAsVariableType.cpp
index a635feb..e628c29 100644
--- a/project2/sql/sqlHandleAsVariableType.cpp
+++ b/project2/sql/sqlHandleAsVariableType.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlHandleAsVariableType.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
 
diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp
index 2876bce..0b19c5e 100644
--- a/project2/sql/sqlMergeTask.cpp
+++ b/project2/sql/sqlMergeTask.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlMergeTask.h"
 #include "columns.h"
 #include "commonObjects.h"
diff --git a/project2/sql/sqlRows.cpp b/project2/sql/sqlRows.cpp
index 867d5cf..83763dd 100644
--- a/project2/sql/sqlRows.cpp
+++ b/project2/sql/sqlRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlRows.h"
 #include "sqlHandleAsVariableType.h"
 #include "rowProcessor.h"
diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp
index d50f6dc..03f67de 100644
--- a/project2/sql/sqlTask.cpp
+++ b/project2/sql/sqlTask.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlTask.h"
 #include <boost/foreach.hpp>
 #include "scriptLoader.h"
diff --git a/project2/sql/sqlTest.cpp b/project2/sql/sqlTest.cpp
index a4375f1..f45b2c9 100644
--- a/project2/sql/sqlTest.cpp
+++ b/project2/sql/sqlTest.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlTest.h"
 #include "scriptLoader.h"
 #include "selectcommand.h"
diff --git a/project2/sql/sqlVariableBinder.cpp b/project2/sql/sqlVariableBinder.cpp
index cc2d98b..c56047c 100644
--- a/project2/sql/sqlVariableBinder.cpp
+++ b/project2/sql/sqlVariableBinder.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlVariableBinder.h"
 #include "command.h"
 #include "variables.h"
diff --git a/project2/sql/sqlWriter.cpp b/project2/sql/sqlWriter.cpp
index 1dcdf05..1220211 100644
--- a/project2/sql/sqlWriter.cpp
+++ b/project2/sql/sqlWriter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sqlWriter.h"
 #include "scripts.h"
 #include <boost/foreach.hpp>
diff --git a/project2/sql/tablepatch.cpp b/project2/sql/tablepatch.cpp
index 3cad0d8..8d61b66 100644
--- a/project2/sql/tablepatch.cpp
+++ b/project2/sql/tablepatch.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "tablepatch.h"
 #include <stdio.h>
 #include <misc.h>
diff --git a/project2/streams/streamNvpRows.cpp b/project2/streams/streamNvpRows.cpp
index 5f9ccf2..2577ffa 100644
--- a/project2/streams/streamNvpRows.cpp
+++ b/project2/streams/streamNvpRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "variables.h"
 #include "scopeObject.h"
 #include "stream.h"
diff --git a/project2/streams/streamRows.cpp b/project2/streams/streamRows.cpp
index 711fbf0..78f6963 100644
--- a/project2/streams/streamRows.cpp
+++ b/project2/streams/streamRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "variables.h"
 #include "scopeObject.h"
 #include "stream.h"
diff --git a/project2/streams/textReader.cpp b/project2/streams/textReader.cpp
index 7cd8a6d..1ac7ba9 100644
--- a/project2/streams/textReader.cpp
+++ b/project2/streams/textReader.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "textReader.h"
 #include "exceptions.h"
 
diff --git a/project2/xml/Jamfile.jam b/project2/xml/Jamfile.jam
index 2c21642..2665444 100644
--- a/project2/xml/Jamfile.jam
+++ b/project2/xml/Jamfile.jam
@@ -16,6 +16,7 @@ lib p2xml :
 	pch
 	[ glob-tree *.cpp ]
 	:
+	<include>.
 	<include>../libmisc
 	<library>libxmlpp
 	<library>../common//p2common
diff --git a/project2/xml/mutators/copy.cpp b/project2/xml/mutators/copy.cpp
index 2d05da9..087cffc 100644
--- a/project2/xml/mutators/copy.cpp
+++ b/project2/xml/mutators/copy.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../xmlPresenter.h"
 #include <boost/foreach.hpp>
 #include <libxml++/document.h>
diff --git a/project2/xml/mutators/copyToAttr.cpp b/project2/xml/mutators/copyToAttr.cpp
index 47afc50..c87facb 100644
--- a/project2/xml/mutators/copyToAttr.cpp
+++ b/project2/xml/mutators/copyToAttr.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../xmlPresenter.h"
 #include <boost/foreach.hpp>
 #include <libxml++/document.h>
diff --git a/project2/xml/mutators/create.cpp b/project2/xml/mutators/create.cpp
index 3dccea5..a10f54a 100644
--- a/project2/xml/mutators/create.cpp
+++ b/project2/xml/mutators/create.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../xmlPresenter.h"
 #include <libxml++/document.h>
 #include <boost/foreach.hpp>
diff --git a/project2/xml/mutators/delete.cpp b/project2/xml/mutators/delete.cpp
index 16ccae7..d6eba58 100644
--- a/project2/xml/mutators/delete.cpp
+++ b/project2/xml/mutators/delete.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../xmlPresenter.h"
 #include <libxml++/document.h>
 #include <boost/foreach.hpp>
diff --git a/project2/xml/mutators/rename.cpp b/project2/xml/mutators/rename.cpp
index c8a03b9..74a4578 100644
--- a/project2/xml/mutators/rename.cpp
+++ b/project2/xml/mutators/rename.cpp
@@ -1,4 +1,4 @@
-#include "../pch.hpp"
+#include <pch.hpp>
 #include "../xmlPresenter.h"
 #include <boost/foreach.hpp>
 #include <libxml++/document.h>
diff --git a/project2/xml/rawView.cpp b/project2/xml/rawView.cpp
index 053ac23..5226caf 100644
--- a/project2/xml/rawView.cpp
+++ b/project2/xml/rawView.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "exceptions.h"
 #include "xml.h"
 #include "presenter.h"
diff --git a/project2/xml/sessionXml.cpp b/project2/xml/sessionXml.cpp
index 7194246..ff3beca 100644
--- a/project2/xml/sessionXml.cpp
+++ b/project2/xml/sessionXml.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "sessionXml.h"
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
diff --git a/project2/xml/transformHtml.cpp b/project2/xml/transformHtml.cpp
index c08d7f8..0659ca8 100644
--- a/project2/xml/transformHtml.cpp
+++ b/project2/xml/transformHtml.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "transformHtml.h"
 #include "scripts.h"
 #include <libxml++/document.h>
diff --git a/project2/xml/transformText.cpp b/project2/xml/transformText.cpp
index dc69b17..7a6e98e 100644
--- a/project2/xml/transformText.cpp
+++ b/project2/xml/transformText.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "scripts.h"
 #include "transformText.h"
 #include "options.h"
diff --git a/project2/xml/xmlCache.cpp b/project2/xml/xmlCache.cpp
index 7f3b5be..8b09dde 100644
--- a/project2/xml/xmlCache.cpp
+++ b/project2/xml/xmlCache.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "cache.h"
 #include "logger.h"
 #include "environment.h"
diff --git a/project2/xml/xmlDocumentCache.cpp b/project2/xml/xmlDocumentCache.cpp
index 3a7c35d..ec8d6a8 100644
--- a/project2/xml/xmlDocumentCache.cpp
+++ b/project2/xml/xmlDocumentCache.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <scriptLoader.h>
 #include "xmlDocumentCache.h"
 #include <string.h>
diff --git a/project2/xml/xmlDocumentPrefetch.cpp b/project2/xml/xmlDocumentPrefetch.cpp
index 6dc2b64..64b236e 100644
--- a/project2/xml/xmlDocumentPrefetch.cpp
+++ b/project2/xml/xmlDocumentPrefetch.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "xmlDocumentPrefetch.h"
 #include "scriptLoader.h"
 
diff --git a/project2/xml/xmlPresenter.cpp b/project2/xml/xmlPresenter.cpp
index 5f7c3dd..671b48b 100644
--- a/project2/xml/xmlPresenter.cpp
+++ b/project2/xml/xmlPresenter.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include <boost/date_time.hpp>
 #include "xmlPresenter.h"
 #include "scriptLoader.h"
diff --git a/project2/xml/xmlRawRows.cpp b/project2/xml/xmlRawRows.cpp
index 6f43720..0da516f 100644
--- a/project2/xml/xmlRawRows.cpp
+++ b/project2/xml/xmlRawRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "xmlRawRows.h"
 #include "environment.h"
 #include <boost/foreach.hpp>
diff --git a/project2/xml/xmlRows.cpp b/project2/xml/xmlRows.cpp
index 4feeafd..01e626f 100644
--- a/project2/xml/xmlRows.cpp
+++ b/project2/xml/xmlRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "xmlRows.h"
 #include "rowProcessor.h"
 #include "xml.h"
diff --git a/project2/xml/xmlScriptParser.cpp b/project2/xml/xmlScriptParser.cpp
index 7563d20..cf873a3 100644
--- a/project2/xml/xmlScriptParser.cpp
+++ b/project2/xml/xmlScriptParser.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "xmlScriptParser.h"
 #include "environment.h"
 #include "scripts.h"
diff --git a/project2/xml/xpathRows.cpp b/project2/xml/xpathRows.cpp
index e7de84c..eedfa8e 100644
--- a/project2/xml/xpathRows.cpp
+++ b/project2/xml/xpathRows.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include <pch.hpp>
 #include "xpathRows.h"
 #include "safeMapFind.h"
 #include "rowProcessor.h"