diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 148ff0ea4..87e8296a1 100644
--- a/lib/base/configobject.cpp
+++ b/lib/base/configobject.cpp
@@ -33,7 +33,6 @@
 #include "base/workqueue.hpp"
 #include "base/context.hpp"
 #include "base/application.hpp"
-#include "config/configitem.hpp"
 #include <fstream>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/lib/base/configwriter.cpp b/lib/base/configwriter.cpp
index 4a7f5d6e4..5372c0885 100644
--- a/lib/base/configwriter.cpp
+++ b/lib/base/configwriter.cpp
@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/configwriter.hpp"
-#include "config/configcompiler.hpp"
 #include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
diff --git a/lib/base/scriptframe.hpp b/lib/base/scriptframe.hpp
index e980a1bd5..baf15b9ff 100644
--- a/lib/base/scriptframe.hpp
+++ b/lib/base/scriptframe.hpp
@@ -20,7 +20,7 @@
 #ifndef SCRIPTFRAME_H
 #define SCRIPTFRAME_H
 
-#include "config/i2-config.hpp"
+#include "base/i2-base.hpp"
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
 #include <boost/thread/tss.hpp>