Index: trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp	(revision 519)
@@ -1,5 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Path.h>
 
 #include <Program.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/BreakPoint.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/BreakPoint.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/BreakPoint.cpp	(revision 519)
@@ -1,5 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Environment.h>
 
 #include <Source.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp	(revision 519)
@@ -1,5 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Path.h>
 
 #include <Compiler.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/NonVolatile.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/NonVolatile.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/NonVolatile.cpp	(revision 519)
@@ -1,5 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Environment.h>
 
 #include "../BasicCompiler_Common/common.h"
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/Hashmap.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/Hashmap.h	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/Hashmap.h	(revision 519)
@@ -4,6 +4,4 @@
 
 #include <memory.h>
-
-#include <jenga/include/common/Exception.h>
 
 #include <BoostSerializationSupport.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h	(revision 519)
@@ -2,6 +2,4 @@
 
 #include <vector>
-
-#include <jenga/include/common/Exception.h>
 
 #include <BoostSerializationSupport.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h	(revision 519)
@@ -7,6 +7,4 @@
 #include <windows.h>
 #include <stdlib.h>
-
-#include <jenga/include/common/Exception.h>
 
 #include <BoostSerializationSupport.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/Type.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/Type.h	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/Type.h	(revision 519)
@@ -6,5 +6,4 @@
 #include <boost/foreach.hpp>
 
-#include <jenga/include/common/Exception.h>
 #include <BoostSerializationSupport.h>
 
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h	(revision 519)
@@ -12,5 +12,4 @@
 #include <stdarg.h>
 
-#include <jenga/include/common/Environment.h>
 #include <BoostSerializationSupport.h>
 
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp	(revision 519)
@@ -15,5 +15,5 @@
 #include <boost/foreach.hpp>
 
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include "../common.h"
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 519)
@@ -15,5 +15,5 @@
 #include <boost/foreach.hpp>
 
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include "../common.h"
@@ -46,4 +46,5 @@
 using namespace ActiveBasic::Common::Lexical;
 
+#include <Hashmap.h>
 #include <Configuration.h>
 #include <Type.h>
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/Program.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/Program.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/Program.cpp	(revision 519)
@@ -1,9 +1,3 @@
 #include "stdafx.h"
-
-#include <shlwapi.h>
-
-#include <jenga/include/common/Environment.h>
-
-#include <Program.h>
 
 Jenga::Common::Logger Program::logger( Jenga::Common::Environment::GetAppDir() + "\\logger.log", true );
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp	(revision 518)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp	(revision 519)
@@ -1,12 +1,3 @@
 #include "stdafx.h"
-
-#include <boost/foreach.hpp>
-
-#include <jenga/include/common/Directory.h>
-#include <jenga/include/common/Path.h>
-
-#include <Source.h>
-#include <Compiler.h>
-
 
 const string BasicSource::generateDirectiveName = "#generate";
Index: trunk/ab5.0/abdev/ab_common/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/ab_common/stdafx.h	(revision 518)
+++ trunk/ab5.0/abdev/ab_common/stdafx.h	(revision 519)
@@ -25,9 +25,5 @@
 #include <boost/serialization/export.hpp>
 
-#include <jenga/include/common/CmdLine.h>
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/File.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include "include/ab_common.h"
Index: trunk/ab5.0/abdev/abdev/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/abdev/stdafx.h	(revision 518)
+++ trunk/ab5.0/abdev/abdev/stdafx.h	(revision 519)
@@ -33,9 +33,5 @@
 #include <boost/serialization/export.hpp>
 
-#include <jenga/include/common/CmdLine.h>
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/File.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include <abdev/ab_common/include/ab_common.h>
Index: trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp
===================================================================
--- trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp	(revision 518)
+++ trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp	(revision 519)
@@ -1,7 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/Directory.h>
 
 #include "../BasicCompiler_Common/common.h"
Index: trunk/ab5.0/abdev/compiler_x64/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 518)
+++ trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 519)
@@ -18,4 +18,5 @@
 #include <fcntl.h>
 #include <io.h>
+#include <shlwapi.h>
 
 //boost libraries
@@ -25,9 +26,5 @@
 #include <boost/serialization/export.hpp>
 
-#include <jenga/include/common/CmdLine.h>
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/File.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include <abdev/ab_common/include/ab_common.h>
Index: trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp
===================================================================
--- trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp	(revision 518)
+++ trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp	(revision 519)
@@ -1,7 +1,3 @@
 #include "stdafx.h"
-
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/Directory.h>
 
 #include "../BasicCompiler_Common/common.h"
Index: trunk/ab5.0/abdev/compiler_x86/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 518)
+++ trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 519)
@@ -18,4 +18,5 @@
 #include <fcntl.h>
 #include <io.h>
+#include <shlwapi.h>
 
 //boost libraries
@@ -25,9 +26,5 @@
 #include <boost/serialization/export.hpp>
 
-#include <jenga/include/common/CmdLine.h>
-#include <jenga/include/common/Environment.h>
-#include <jenga/include/common/File.h>
-#include <jenga/include/common/Path.h>
-#include <jenga/include/common/String.h>
+#include <jenga/include/jenga.h>
 
 #include <abdev/ab_common/include/ab_common.h>