14 files changed, 19 insertions, 16 deletions
diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp
index 8bdacdf..f13fbc6 100644
--- a/project2/sql/rdbmsDataSource.cpp
+++ b/project2/sql/rdbmsDataSource.cpp
@@ -1,8 +1,9 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "rdbmsDataSource.h"
 #include "connectionLoader.h"
 #include <sys/utsname.h>
 #include "logger.h"
+#include "scripts.h"
 #include <errno.h>
 #include <boost/foreach.hpp>
 
diff --git a/project2/sql/sqlBulkLoad.cpp b/project2/sql/sqlBulkLoad.cpp
index b26b0c8..73cd5e0 100644
--- a/project2/sql/sqlBulkLoad.cpp
+++ b/project2/sql/sqlBulkLoad.cpp
@@ -1,5 +1,7 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "task.h"
+#include <commonObjects.h>
+#include "rdbmsDataSource.h"
 #include "scopeObject.h"
 #include "stream.h"
 
diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp
index 7fe0408..bb8adb1 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 e628c29..a635feb 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 0b19c5e..2876bce 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/sqlMergeTask.h b/project2/sql/sqlMergeTask.h
index e90cda5..b63c277 100644
--- a/project2/sql/sqlMergeTask.h
+++ b/project2/sql/sqlMergeTask.h
@@ -9,6 +9,7 @@
 #include "task.h"
 #include "iterate.h"
 #include "variables.h"
+#include "sqlWriter.h"
 #include <string>
 #include <set>
 #include <map>
diff --git a/project2/sql/sqlRows.cpp b/project2/sql/sqlRows.cpp
index 83763dd..867d5cf 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 03f67de..d50f6dc 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 f45b2c9..a4375f1 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 c56047c..cc2d98b 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/sqlVariableBinder.h b/project2/sql/sqlVariableBinder.h
index 476c63b..4bbee9f 100644
--- a/project2/sql/sqlVariableBinder.h
+++ b/project2/sql/sqlVariableBinder.h
@@ -1,15 +1,11 @@
 #ifndef SQLVARIABLEBINDER_H
 #define SQLVARIABLEBINDER_H
 
-#include <boost/variant.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
-#include <glibmm/ustring.h>
+#include <variableType.h>
 
 namespace DB {
 	class Command;
 }
-class Null;
 class SqlVariableBinder : public boost::static_visitor<> {
 	public:
 		SqlVariableBinder(DB::Command * c, unsigned int i);
diff --git a/project2/sql/sqlWriter.cpp b/project2/sql/sqlWriter.cpp
index f67eb1c..1dcdf05 100644
--- a/project2/sql/sqlWriter.cpp
+++ b/project2/sql/sqlWriter.cpp
@@ -1,6 +1,8 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "sqlWriter.h"
+#include "scripts.h"
 #include <boost/foreach.hpp>
+#include <boost/bind.hpp>
 #include "sqlVariableBinder.h"
 
 DynamicSql::SqlWriter::SqlWriter()
diff --git a/project2/sql/tablepatch.cpp b/project2/sql/tablepatch.cpp
index 8d61b66..3cad0d8 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/sql/tablepatch.h b/project2/sql/tablepatch.h
index 515c8bd..6903dc1 100644
--- a/project2/sql/tablepatch.h
+++ b/project2/sql/tablepatch.h
@@ -7,6 +7,7 @@
 #include <connection.h>
 #include <modifycommand.h>
 #include <selectcommand.h>
+#include <buffer.h>
 
 class TablePatch {
 	public: