diff --git a/CMakeLists.txt b/CMakeLists.txt
index 471d322b1..0e16ca82b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,17 @@ set(oKularagg2_SRCS
 )
 kde4_add_kcfg_files(oKularconf_SRCS ${CMAKE_SOURCE_DIR}/okular/conf/settings.kcfgc )
 
-set(oKularpart_PART_SRCS part.cpp ${oKularconf_SRCS} ${oKularcore_SRCS} ${oKularui_SRCS} ${oKularagg2_SRCS} )
+set(oKularcore_SRCS ${oKularconf_SRCS} ${oKularcore_SRCS} )
+
+kde4_automoc(${oKularcore_SRCS})
+
+kde4_add_plugin(oKularcore WITH_PREFIX ${oKularcore_SRCS})
+
+target_link_libraries(oKularcore  ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} m )
+
+install_targets(${LIB_INSTALL_DIR} oKularcore )
+
+set(oKularpart_PART_SRCS part.cpp ${oKularui_SRCS} ${oKularagg2_SRCS} )
 
 kde4_automoc(${oKularpart_PART_SRCS})
 
@@ -72,7 +82,7 @@ kde4_add_plugin(oKularpart WITH_PREFIX ${oKularpart_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} oKularpart )
 
-target_link_libraries(oKularpart  ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} )
+target_link_libraries(oKularpart  oKularcore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 oKularpart )
 
diff --git a/core/document.cpp b/core/document.cpp
index 6b01390e8..e0e4ba62b 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -40,7 +40,7 @@
 #include "link.h"
 #include "chooseenginedialog.h"
 
-#include "conf/settings.h"
+#include "settings.h"
 
 // structures used internally by KPDFDocument for local variables storage
 class AllocatedPixmap;
diff --git a/core/page.cpp b/core/page.cpp
index 9c68a908b..47b05d8bd 100644
--- a/core/page.cpp
+++ b/core/page.cpp
@@ -18,7 +18,7 @@
 #include "pagetransition.h"
 #include "link.h"
 #include "annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "area.h"
 
 // temp includes
diff --git a/part.cpp b/part.cpp
index 666686dd6..a18948921 100644
--- a/part.cpp
+++ b/part.cpp
@@ -69,7 +69,7 @@
 #include "ui/propertiesdialog.h"
 #include "ui/presentationwidget.h"
 #include "conf/preferencesdialog.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "core/document.h"
 #include "core/generator.h"
 #include "core/page.h"
diff --git a/ui/pagepainter.cpp b/ui/pagepainter.cpp
index 5320ed64b..dc4945f83 100644
--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@@ -25,7 +25,7 @@
 #include "core/area.h"
 #include "core/page.h"
 #include "core/annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 void PagePainter::paintPageOnPainter( QPainter * destPainter, const KPDFPage * page,
     int pixID, int flags, int scaledWidth, int scaledHeight, const QRect & limits )
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 328c541ff..a10e1122f 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -57,7 +57,7 @@
 #include "core/misc.h"
 #include "core/link.h"
 #include "core/generator.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 #define ROUND(x) (int(x + 0.5))
 
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index cc7375a37..58767e10b 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -26,7 +26,7 @@
 #include "core/document.h"
 #include "core/page.h"
 #include "core/annotations.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "pageview.h"
 #include "pageviewutils.h"
 #include "pageviewannotator.h"
diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp
index 13b7bbd8b..546b8a0b2 100644
--- a/ui/pageviewutils.cpp
+++ b/ui/pageviewutils.cpp
@@ -27,7 +27,7 @@
 // local includes
 #include "pageviewutils.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 /*********************/
 /** PageViewItem     */
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 6c1ce5803..37b79be86 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -36,7 +36,7 @@
 #include "core/generator.h"
 #include "core/page.h"
 #include "core/link.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 
 // comment this to disable the top-right progress indicator
diff --git a/ui/searchwidget.cpp b/ui/searchwidget.cpp
index 51e671ef1..0aec58fde 100644
--- a/ui/searchwidget.cpp
+++ b/ui/searchwidget.cpp
@@ -22,7 +22,7 @@
 // local includes
 #include "searchwidget.h"
 #include "core/document.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 SearchWidget::SearchWidget( QWidget * parent, KPDFDocument * document )
     : KToolBar( parent, "iSearchBar" ), m_document( document ),
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index 1e88cae11..77fe4acd7 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -24,7 +24,7 @@
 #include "core/annotations.h"
 #include "core/document.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "side_reviews.h"
 
 
diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp
index bb3212482..887062c51 100644
--- a/ui/thumbnaillist.cpp
+++ b/ui/thumbnaillist.cpp
@@ -27,7 +27,7 @@
 #include "core/document.h"
 #include "core/generator.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 // ThumbnailWidget represents a single thumbnail in the ThumbnailList
 class ThumbnailWidget : public QWidget
diff --git a/ui/toc.cpp b/ui/toc.cpp
index 1f08d7243..75e0d7e63 100644
--- a/ui/toc.cpp
+++ b/ui/toc.cpp
@@ -14,7 +14,7 @@
 #include "toc.h"
 #include "core/document.h"
 #include "core/page.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "core/link.h"
 
 // uncomment following to enable a 2nd column showing the page referred