Slash the amount of inclusion in pre-compiled headers

11 files changed, 16 insertions, 86 deletions

diff --git a/project2/cgi/pch.hpp b/project2/cgi/pch.hpp
index 065558b..125c912 100644
--- a/project2/cgi/pch.hpp
+++ b/project2/cgi/pch.hpp
@@ -2,11 +2,9 @@
 #ifndef CGI_PCH
 #define CGI_PCH
 
-#include "cgiRequestContext.h"
-#include "cgiHttpHeader.h"
-#include "scriptLoader.h"
+#include <boost/tuple/tuple.hpp>
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/bind.hpp>
-#include "options.h"
 #include <cgicc/CgiEnvironment.h>
 #include <cgicc/Cgicc.h>
 #include <cgicc/HTTPContentHeader.h>
diff --git a/project2/common/pch.hpp b/project2/common/pch.hpp
index a18ebbb..2feca3c 100644
--- a/project2/common/pch.hpp
+++ b/project2/common/pch.hpp
@@ -5,15 +5,10 @@
 #include <algorithm>
 #include <boost/any.hpp>
 #include <boost/bind.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/function.hpp>
+#include <boost/function/function_fwd.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>
+#include <boost/variant/variant_fwd.hpp>
 #include <glibmm/ustring.h>
 #include <intrusivePtrBase.h>
 #include <iostream>
@@ -25,13 +20,6 @@
 #include <string.h>
 #include <string>
 #include <vector>
-#include "scriptStorage.h"
-#include "scriptLoader.h"
-#include "plugable.h"
-#include "variables.h"
-#include "variableType.h"
-#include "sourceObject.h"
-#include "scripts.h"
 
 #endif
 #endif
diff --git a/project2/common/scripts.cpp b/project2/common/scripts.cpp
index 0410817..3714d37 100644
--- a/project2/common/scripts.cpp
+++ b/project2/common/scripts.cpp
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include "variables/fixed.h"
 #include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem/path.hpp>
 #include "appInstance.h"
 #include <plugins.impl.h>
 
diff --git a/project2/common/variableType.cpp b/project2/common/variableType.cpp
index 2902638..84170b7 100644
--- a/project2/common/variableType.cpp
+++ b/project2/common/variableType.cpp
@@ -1,6 +1,7 @@
 #include <pch.hpp>
 #include "variableType.h"
 #include "logger.h"
+#include "exceptions.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/project2/common/viewHost.h b/project2/common/viewHost.h
index 5ede3e4..09196f3 100644
--- a/project2/common/viewHost.h
+++ b/project2/common/viewHost.h
@@ -5,7 +5,6 @@
 #include "presenter.h"
 #include "checkHost.h"
 #include <set>
-#include <boost/filesystem/path.hpp>
 #include "commonObjects.h"
 
 class ViewHost : virtual public CheckHost, virtual public CommonObjects {
diff --git a/project2/console/pch.hpp b/project2/console/pch.hpp
index fa98d28..829f4a0 100644
--- a/project2/console/pch.hpp
+++ b/project2/console/pch.hpp
@@ -2,13 +2,8 @@
 #ifndef CONSOLE_PCH
 #define CONSOLE_PCH
 
-#include "consoleAppEngine.h"
-#include "consolePresenter.h"
-#include "exceptions.h"
-#include "logger.h"
-#include "scriptLoader.h"
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/bind.hpp>
-#include "options.h"
 #include <iostream>
 #include <string>
 
diff --git a/project2/files/pch.hpp b/project2/files/pch.hpp
index 58f05b9..91c45d8 100644
--- a/project2/files/pch.hpp
+++ b/project2/files/pch.hpp
@@ -2,29 +2,11 @@
 #ifndef FILES_PCH
 #define FILES_PCH
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/trim.hpp>
 #include <boost/bind.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/lexical_cast.hpp>
-#include "definedColumns.h"
-#include "exceptions.h"
-#include "fsRows.h"
-#include <glibmm/fileutils.h>
-#include <glibmm/iochannel.h>
-#include "logger.h"
-#include "optionsSource.h"
-#include "rowProcessor.h"
-#include "rowSet.h"
-#include "scopeExit.h"
-#include "scriptLoader.h"
-#include "scripts.h"
-#include "scriptStorage.h"
-#include "variables.h"
+#include <boost/variant/variant_fwd.hpp>
 
 #endif
 #endif
diff --git a/project2/ice/pch.hpp b/project2/ice/pch.hpp
index 3ed09f0..1268e36 100644
--- a/project2/ice/pch.hpp
+++ b/project2/ice/pch.hpp
@@ -4,16 +4,12 @@
 
 #include <Ice/Ice.h>
 #include <boost/filesystem.hpp>
-#include <boost/function.hpp>
+#include <boost/function/function_fwd.hpp>
 #include <boost/optional.hpp>
-#include <commonObjects.h>
-#include <exceptions.h>
-#include <logger.h>
 #include <map>
-#include <options.h>
 #include <Slice/Parser.h>
 #include <string>
-#include <variables.h>
+#include <boost/variant/variant_fwd.hpp>
 #include <slicer/modelParts.h>
 #include <slicer/serializer.h>
 
diff --git a/project2/json/pch.hpp b/project2/json/pch.hpp
index 1309317..3aa19d4 100644
--- a/project2/json/pch.hpp
+++ b/project2/json/pch.hpp
@@ -2,10 +2,8 @@
 #ifndef JSON_PCH
 #define JSON_PCH
 
-#include <boost/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 #include <glibmm/ustring.h>
-#include <variables.h>
-#include <presenter.h>
 #include <map>
 #include <stack>
 
diff --git a/project2/sql/pch.hpp b/project2/sql/pch.hpp
index e3dcda2..857eb5b 100644
--- a/project2/sql/pch.hpp
+++ b/project2/sql/pch.hpp
@@ -2,31 +2,11 @@
 #ifndef SQL_PCH
 #define SQL_PCH
 
-#include "cache.h"
-#include "column.h"
-#include "columns.h"
-#include "command.h"
-#include "commonObjects.h"
-#include "exceptions.h"
-#include "iHaveParameters.h"
-#include "logger.h"
-#include "modifycommand.h"
-#include "rdbmsDataSource.h"
-#include "rowProcessor.h"
-#include "rowSet.h"
-#include "selectcommand.h"
-#include "sqlHandleAsVariableType.h"
-#include "sqlVariableBinder.h"
-#include "sqlWriter.h"
-#include "variables.h"
-#include "scriptLoader.h"
-#include "scripts.h"
-#include <boost/bind.hpp>
-#include "options.h"
-#include <buffer.h>
-#include <column.h>
-#include <errno.h>
 #include <stdexcept>
+#include <string>
+#include <glibmm/ustring.h>
+#include <boost/variant/variant_fwd.hpp>
+#include <connection.h>
 
 #endif
 #endif
diff --git a/project2/xml/pch.hpp b/project2/xml/pch.hpp
index 1eb8309..5832628 100644
--- a/project2/xml/pch.hpp
+++ b/project2/xml/pch.hpp
@@ -2,16 +2,8 @@
 #ifndef XML_PCH
 #define XML_PCH
 
-#include "cache.h"
-#include "exceptions.h"
-#include "iHaveParameters.h"
-#include "logger.h"
-#include "presenter.h"
-#include "rowProcessor.h"
-#include "safeMapFind.h"
-#include "variables.h"
 #include <boost/filesystem/path.hpp>
-#include "options.h"
+#include <boost/variant/variant_fwd.hpp>
 #include <libxml++/document.h>
 #include <libxml++/nodes/element.h>
 #include <libxml++/nodes/textnode.h>