diff --git a/build/Ba7.vcxproj b/build/Ba7.vcxproj
index 1799d702f..6a42c33c1 100644
--- a/build/Ba7.vcxproj
+++ b/build/Ba7.vcxproj
@@ -74,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>.\libraries.\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/Cg0.vcxproj b/build/Cg0.vcxproj
index 0f842744f..15f0d4607 100644
--- a/build/Cg0.vcxproj
+++ b/build/Cg0.vcxproj
@@ -172,12 +172,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cg0400.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\src\cg\cg0400.cpp" />
     <ClCompile Include="..\src\cg\cg0500.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -218,10 +213,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </MskCompiler>
     <MskCompiler Include="..\src\cg\cg0300a.uml" />
-    <MskCompiler Include="..\src\cg\cg0400a.uml" />
     <MskCompiler Include="..\src\cg\cg0400b.uml" />
     <MskCompiler Include="..\src\cg\cg0500a.uml" />
     <MskCompiler Include="..\src\cg\cg0700a.uml" />
+    <MskCompiler Include="..\src\cg\cg4300a.uml" />
   </ItemGroup>
   <ItemGroup>
     <TrrCompiler Include="..\src\cg\f103.trr" />
diff --git a/build/Cg0.vcxproj.filters b/build/Cg0.vcxproj.filters
index 61bfef6fe..ac3359b67 100644
--- a/build/Cg0.vcxproj.filters
+++ b/build/Cg0.vcxproj.filters
@@ -41,9 +41,6 @@
     <ClCompile Include="..\src\cg\cg0300.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cg0400.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\cg\cg0500.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -62,6 +59,9 @@
     <ClCompile Include="..\src\cg\cgpim.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cg\cg0400.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\cg\cg0100a.uml">
@@ -76,16 +76,16 @@
     <MskCompiler Include="..\src\cg\cg0300a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\src\cg\cg0400a.uml">
+    <MskCompiler Include="..\src\cg\cg0500a.uml">
+      <Filter>Masks</Filter>
+    </MskCompiler>
+    <MskCompiler Include="..\src\cg\cg0700a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
     <MskCompiler Include="..\src\cg\cg0400b.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\src\cg\cg0500a.uml">
-      <Filter>Masks</Filter>
-    </MskCompiler>
-    <MskCompiler Include="..\src\cg\cg0700a.uml">
+    <MskCompiler Include="..\src\cg\cg4300a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
   </ItemGroup>
diff --git a/build/Sc0.vcxproj b/build/Sc0.vcxproj
index bfb9bab5f..d8e124fc5 100644
--- a/build/Sc0.vcxproj
+++ b/build/Sc0.vcxproj
@@ -131,7 +131,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/Sc1.vcxproj b/build/Sc1.vcxproj
index 7df98f98d..586961ba2 100644
--- a/build/Sc1.vcxproj
+++ b/build/Sc1.vcxproj
@@ -76,7 +76,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/Sc2.vcxproj b/build/Sc2.vcxproj
index d50a06174..ef2655da1 100644
--- a/build/Sc2.vcxproj
+++ b/build/Sc2.vcxproj
@@ -74,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/Sc3.vcxproj b/build/Sc3.vcxproj
index 085d4c449..43c5d577a 100644
--- a/build/Sc3.vcxproj
+++ b/build/Sc3.vcxproj
@@ -40,7 +40,7 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -74,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -166,16 +166,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\lib\AgaLib.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="..\lib\AgaLibd.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </Library>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
   </ItemGroup>
diff --git a/build/Sc3.vcxproj.filters b/build/Sc3.vcxproj.filters
index 2b9810ad3..df8018a72 100644
--- a/build/Sc3.vcxproj.filters
+++ b/build/Sc3.vcxproj.filters
@@ -35,10 +35,6 @@
       <Filter>Masks</Filter>
     </MskCompiler>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\lib\AgaLib.lib" />
-    <Library Include="..\lib\AgaLibd.lib" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
   </ItemGroup>