diff --git a/core/cfg/cfg.cpp b/core/cfg/cfg.cpp
index 56cfa01cc..fe6d1819a 100644
--- a/core/cfg/cfg.cpp
+++ b/core/cfg/cfg.cpp
@@ -12,7 +12,7 @@
 string cfgPath;
 bool save_config = true;
 
-ConfigFile cfgdb;
+emucfg::ConfigFile cfgdb;
 
 void savecfgf()
 {
diff --git a/core/cfg/ini.cpp b/core/cfg/ini.cpp
index ca114f2c5..041bd9a76 100644
--- a/core/cfg/ini.cpp
+++ b/core/cfg/ini.cpp
@@ -3,6 +3,8 @@
 
 wchar* trim_ws(wchar* str);
 
+namespace emucfg {
+
 /* ConfigEntry */
 
 string ConfigEntry::get_string()
@@ -281,3 +283,6 @@ void ConfigFile::save(FILE* file)
 		fputs("\n", file);
 	}
 }
+
+} // namespace emucfg
+
diff --git a/core/cfg/ini.h b/core/cfg/ini.h
index 8cbc80d46..0c9b20017 100644
--- a/core/cfg/ini.h
+++ b/core/cfg/ini.h
@@ -2,6 +2,8 @@
 #include "types.h"
 #include <map>
 
+namespace emucfg {
+
 struct ConfigEntry {
 	string value;
 	string get_string();
@@ -41,3 +43,6 @@ struct ConfigFile {
 		void set_int(string section_name, string entry_name, int value, bool is_virtual = false);
 		void set_bool(string section_name, string entry_name, bool value, bool is_virtual = false);
 };
+
+} // namespace emucfg
+
diff --git a/core/linux-dist/evdev.cpp b/core/linux-dist/evdev.cpp
index 9d317d5c2..a1b5646a2 100644
--- a/core/linux-dist/evdev.cpp
+++ b/core/linux-dist/evdev.cpp
@@ -161,7 +161,7 @@
 
 	std::map<std::string, EvdevControllerMapping> loaded_mappings;
 
-	int load_keycode(ConfigFile* cfg, string section, string dc_key)
+	int load_keycode(emucfg::ConfigFile* cfg, string section, string dc_key)
 	{
 		int code = -1;
 
@@ -217,7 +217,7 @@
 
 	EvdevControllerMapping load_mapping(FILE* fd)
 	{
-		ConfigFile mf;
+		emucfg::ConfigFile mf;
 		mf.parse(fd);
 
 		EvdevControllerMapping mapping = {
diff --git a/core/rec-cpp/rec_cpp.cpp b/core/rec-cpp/rec_cpp.cpp
index 8987211ab..b2061c3bd 100644
--- a/core/rec-cpp/rec_cpp.cpp
+++ b/core/rec-cpp/rec_cpp.cpp
@@ -13,7 +13,6 @@
 #include "hw/sh4/dyna/ngen.h"
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/dyna/regalloc.h"
-#include "emitter/x86_emitter.h"
 #include "profiler/profiler.h"
 #include "oslib/oslib.h"