diff --git a/CrossGen.workspace b/CrossGen.workspace
index 8b225f3..18ecac8 100644
--- a/CrossGen.workspace
+++ b/CrossGen.workspace
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="CrossGen" Database="">
-  <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="Yes"/>
-  <Project Name="CrossBench" Path="CrossBench/CrossBench.project"/>
+  <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="No"/>
+  <Project Name="CrossBench" Path="CrossBench/CrossBench.project" Active="Yes"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="no">
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="wxCrossGen" ConfigName="Debug"/>
       <Project Name="CrossBench" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="wxCrossGen" ConfigName="Release"/>
       <Project Name="CrossBench" ConfigName="Release"/>
     </WorkspaceConfiguration>
diff --git a/Makefile b/Makefile
index c1fa320..73e2032 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-	@echo "----------Building project:[ wxCrossGen - Release ]----------"
-	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk"
+	@echo "----------Building project:[ CrossBench - Debug ]----------"
+	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk"
 clean:
-	@echo "----------Cleaning project:[ wxCrossGen - Release ]----------"
-	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk" clean
+	@echo "----------Cleaning project:[ CrossBench - Debug ]----------"
+	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk" clean
diff --git a/src/crossbasetypes.hpp b/src/crossbasetypes.hpp
index 1ec31cb..528f041 100644
--- a/src/crossbasetypes.hpp
+++ b/src/crossbasetypes.hpp
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include <cstdint>
+#include <map>
 
 typedef std::map<wxString,wxString> DictType;
 typedef std::vector< std::vector<wxChar> > GridType;