diff --git a/src/filters/filters.cpp b/src/filters/filters.cpp
index 974ef3cd..558cc2ab 100644
--- a/src/filters/filters.cpp
+++ b/src/filters/filters.cpp
@@ -8,7 +8,7 @@ namedfilter InsertFilter(std::string filterName, FilterFunc thirtyTwoBitFilter,
 }
 
 //Actually make the fitlermap (since C++11 doesn't work right now)
-std::map<std::string,filterpair> makeFilterMap()
+const std::map<std::string,filterpair> makeFilterMap()
 {
     InsertFilter("Pixelate",Pixelate32,Pixelate);
     InsertFilter("Scanlines",Scanlines32,Scanlines);
diff --git a/src/filters/filters.hpp b/src/filters/filters.hpp
index 100857b8..0e787c59 100644
--- a/src/filters/filters.hpp
+++ b/src/filters/filters.hpp
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "interframe.hpp"
-#include "../System.h"
+#include "../common/Types.h"
 
 //sdl
 // Function pointer type for a filter function
@@ -16,10 +16,10 @@ typedef std::pair<FilterFunc,FilterFunc> filterpair;
 typedef std::pair<std::string,filterpair> namedfilter;
 
 //Function to make the filterMap
-std::map<std::string,filterpair> makeFilterMap();
+const std::map<std::string,filterpair> makeFilterMap();
 
 //A named map of all the filters
-static const std::map<std::string,filterpair> filterMap = makeFilterMap();
+// static const std::map<std::string,filterpair> filterMap = makeFilterMap();
 
 //These are the available filters
 
diff --git a/src/filters/interframe.hpp b/src/filters/interframe.hpp
index 8a20f4e7..e2a1443b 100644
--- a/src/filters/interframe.hpp
+++ b/src/filters/interframe.hpp
@@ -3,7 +3,7 @@
 #ifndef INTERFRAME_HPP
 #define INTERFRAME_HPP
 
-#include "../System.h"
+#include "../common/Types.h"
 
 extern int RGB_LOW_BITS_MASK;