diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 15382d8b8..9f1e0072f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,7 +44,7 @@ add_library(libslic3r STATIC
     ${LIBDIR}/libslic3r/BoundingBox.cpp
     ${LIBDIR}/libslic3r/BridgeDetector.cpp
     ${LIBDIR}/libslic3r/ClipperUtils.cpp
-    ${LIBDIR}/libslic3r/Config.cpp
+    ${LIBDIR}/libslic3r/ConfigBase.cpp
     ${LIBDIR}/libslic3r/ExPolygon.cpp
     ${LIBDIR}/libslic3r/ExPolygonCollection.cpp
     ${LIBDIR}/libslic3r/Extruder.cpp
diff --git a/src/slic3r.cpp b/src/slic3r.cpp
index 82a04a1f1..2e8aaf387 100644
--- a/src/slic3r.cpp
+++ b/src/slic3r.cpp
@@ -1,4 +1,4 @@
-#include "Config.hpp"
+#include "ConfigBase.hpp"
 #include "Geometry.hpp"
 #include "IO.hpp"
 #include "Model.hpp"
diff --git a/xs/src/libslic3r/ConfigBase.cpp b/xs/src/libslic3r/ConfigBase.cpp
index ad11df720..161c96212 100644
--- a/xs/src/libslic3r/ConfigBase.cpp
+++ b/xs/src/libslic3r/ConfigBase.cpp
@@ -1,4 +1,4 @@
-#include "Config.hpp"
+#include "ConfigBase.hpp"
 #include <assert.h>
 #include <ctime>
 #include <fstream>
diff --git a/xs/src/libslic3r/ConfigBase.hpp b/xs/src/libslic3r/ConfigBase.hpp
index d1ea39002..1db0f9a96 100644
--- a/xs/src/libslic3r/ConfigBase.hpp
+++ b/xs/src/libslic3r/ConfigBase.hpp
@@ -1,5 +1,5 @@
-#ifndef slic3r_Config_hpp_
-#define slic3r_Config_hpp_
+#ifndef slic3r_ConfigBase_hpp_
+#define slic3r_ConfigBase_hpp_
 
 #include <map>
 #include <climits>
@@ -751,4 +751,4 @@ class UnknownOptionException : public std::exception {};
 
 }
 
-#endif
+#endif 
diff --git a/xs/src/libslic3r/Flow.hpp b/xs/src/libslic3r/Flow.hpp
index fb4d8e237..cc8f90723 100644
--- a/xs/src/libslic3r/Flow.hpp
+++ b/xs/src/libslic3r/Flow.hpp
@@ -2,7 +2,7 @@
 #define slic3r_Flow_hpp_
 
 #include "libslic3r.h"
-#include "Config.hpp"
+#include "ConfigBase.hpp"
 #include "ExtrusionEntity.hpp"
 
 namespace Slic3r {
diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp
index 0aa65ba28..6db11d275 100644
--- a/xs/src/libslic3r/PrintConfig.hpp
+++ b/xs/src/libslic3r/PrintConfig.hpp
@@ -19,7 +19,7 @@
 #define slic3r_PrintConfig_hpp_
 
 #include "libslic3r.h"
-#include "Config.hpp"
+#include "ConfigBase.hpp"
 
 #define OPT_PTR(KEY) if (opt_key == #KEY) return &this->KEY