diff --git a/distro/win32/_sgpem.vcproj b/distro/win32/_sgpem.vcproj
index 1d921f4..6d9ddb7 100644
--- a/distro/win32/_sgpem.vcproj
+++ b/distro/win32/_sgpem.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""$(SolutionDir)config";"$(SolutionDir)..\..";"$(PYTHON_BASEPATH)\include";"$(SolutionDir)..\..\src\backend""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SGPEM_EXPORTS;_SECURE_SCL_THROWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SGPEM_EXPORTS;_SECURE_SCL_THROWS;VISIBILITY_SUPPORT_HH"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..&quot;;&quot;$(PYTHON_BASEPATH)\include&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SGPEM_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SGPEM_EXPORTS;VISIBILITY_SUPPORT_HH"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/distro/win32/backend.vcproj b/distro/win32/backend.vcproj
index 58312ac..4946bff 100644
--- a/distro/win32/backend.vcproj
+++ b/distro/win32/backend.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BACKEND_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BACKEND_EXPORTS;VISIBILITY_SUPPORT_HH"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -51,6 +51,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4290;4275;4250;4251"
+				ForcedIncludeFiles="config.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -120,12 +121,14 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BACKEND_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BACKEND_EXPORTS;VISIBILITY_SUPPORT_HH"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4275;4290"
+				ForcedIncludeFiles="config.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -207,6 +210,10 @@
 				RelativePath="..\..\src\backend\concrete_thread_statistics.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\backend\cpp_resource_policy_manager.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\backend\cpu_policies_gatekeeper.cc"
 				>
@@ -223,10 +230,6 @@
 				RelativePath="..\..\src\backend\cpu_policy_manager.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\backend\default_resource_policy_manager.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\backend\dynamic_process.cc"
 				>
@@ -267,10 +270,6 @@
 				RelativePath="..\..\src\backend\history_observer.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\backend\holt_graph.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\backend\invalid_plugin_exception.cc"
 				>
@@ -469,6 +468,10 @@
 				RelativePath="..\..\src\backend\concrete_thread_statistics.hh"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\backend\sgpemv2\cpp_resource_policy_manager.hh"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\backend\sgpemv2\cpu_policies_gatekeeper.hh"
 				>
@@ -485,10 +488,6 @@
 				RelativePath="..\..\src\backend\sgpemv2\cpu_policy_manager.hh"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\backend\sgpemv2\default_resource_policy_manager.hh"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\backend\dynamic_process.hh"
 				>
@@ -533,10 +532,6 @@
 				RelativePath="..\..\src\backend\sgpemv2\history_observer.hh"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\backend\sgpemv2\holt_graph.hh"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\backend\sgpemv2\invalid_plugin_exception.hh"
 				>
diff --git a/distro/win32/pyloader.vcproj b/distro/win32/pyloader.vcproj
index f13e1a4..5e827f6 100644
--- a/distro/win32/pyloader.vcproj
+++ b/distro/win32/pyloader.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..\plugins\pyloader&quot;;&quot;$(PYTHON_BASEPATH)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYLOADER_EXPORTS;_SECURE_SCL_THROWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYLOADER_EXPORTS;_SECURE_SCL_THROWS;VISIBILITY_SUPPORT_HH"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -53,6 +53,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4250;4290;4275;4251;4297"
+				ForcedIncludeFiles=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -126,12 +127,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..\plugins\pyloader&quot;;&quot;$(PYTHON_BASEPATH)\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYLOADER_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYLOADER_EXPORTS;VISIBILITY_SUPPORT_HH"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/distro/win32/sgpemv2.vcproj b/distro/win32/sgpemv2.vcproj
index aa485d2..e4c0ce8 100644
--- a/distro/win32/sgpemv2.vcproj
+++ b/distro/win32/sgpemv2.vcproj
@@ -26,7 +26,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Copy glade stuff"
-				CommandLine="copy &quot;$(SolutionDir)..\..\glade\*.glade&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)..\..\data\logo.png&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;"
+				CommandLine="copy &quot;$(SolutionDir)..\..\glade\*.glade&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)..\..\data\logo.png&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VISIBILITY_SUPPORT_HH"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -53,6 +53,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4250;4290;4275;4251"
+				ForcedIncludeFiles="config.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -109,7 +110,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Copy glade stuff"
-				CommandLine="copy &quot;$(SolutionDir)..\..\glade\*.glade&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)..\..\data\logo.png&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;"
+				CommandLine="copy &quot;$(SolutionDir)..\..\glade\*.glade&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)..\..\data\logo.png&quot; &quot;$(SolutionDir)$(ConfigurationName)\glade&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -126,12 +127,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VISIBILITY_SUPPORT_HH"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				ForcedIncludeFiles="config.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -239,10 +241,6 @@
 				RelativePath="..\..\src\resources_widget.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\schedulable_state_widget.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\schedulables_statistics_widget.cc"
 				>
@@ -329,10 +327,6 @@
 				RelativePath="..\..\src\resources_widget.hh"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\schedulable_state_widget.hh"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\schedulables_statistics_widget.hh"
 				>
diff --git a/distro/win32/xmlsave.vcproj b/distro/win32/xmlsave.vcproj
index 9e254b2..ac46705 100644
--- a/distro/win32/xmlsave.vcproj
+++ b/distro/win32/xmlsave.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..\plugins\xmlsave&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLSAVE_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLSAVE_EXPORTS;VISIBILITY_SUPPORT_HH"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -51,6 +51,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4290;4275;4251"
+				ForcedIncludeFiles=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -122,12 +123,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)config&quot;;&quot;$(SolutionDir)..\..\src\backend&quot;;&quot;$(SolutionDir)..\..\plugins\xmlsave&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XMLSAVE_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XMLSAVE_EXPORTS;VISIBILITY_SUPPORT_HH"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/backend/sgpemv2/templates/down_cast.tcc b/src/backend/sgpemv2/templates/down_cast.tcc
index 55948ba..9a4ec28 100644
--- a/src/backend/sgpemv2/templates/down_cast.tcc
+++ b/src/backend/sgpemv2/templates/down_cast.tcc
@@ -22,7 +22,7 @@
 #ifndef DOWN_CAST_TCC
 #define DOWN_CAST_TCC 1
 
-#if (not defined NDEBUG) && (not defined _MSC_VER)
+#if not defined(NDEBUG) && not defined(_MSC_VER)
 #include <sys/types.h>
 #include <iostream>
 #include <signal.h>
@@ -113,7 +113,7 @@ namespace sgpem
     template<typename From>
     inline To* operator()(From* obj) const
     {
-#if (not defined NDEBUG) && (not defined _MSC_VER)
+#if not defined(NDEBUG) && not defined(_MSC_VER)
       To* check_ptr = dynamic_cast<To*>(obj);
       if(check_ptr == NULL)
         {