diff --git a/CMakeLists.txt b/CMakeLists.txt
index 836b1912f..3b882f31a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ set_package_properties("LibKScreen" PROPERTIES
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DTRANSLATION_DOMAIN="okular")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core)
 
 add_subdirectory( active )
 add_subdirectory( ui )
@@ -164,7 +164,7 @@ install( FILES
            core/fileprinter.h
            core/observer.h
            ${CMAKE_CURRENT_BINARY_DIR}/core/version.h
-           ${CMAKE_CURRENT_BINARY_DIR}/okularcore_export.h
+           ${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h
            ${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
          DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel)
 
@@ -183,7 +183,7 @@ ki18n_wrap_ui(okularcore_SRCS
 kconfig_add_kcfg_files(okularcore_SRCS conf/settings_core.kcfgc )
 
 add_library(okularcore SHARED ${okularcore_SRCS})
-generate_export_header(okularcore BASE_NAME okularcore)
+generate_export_header(okularcore BASE_NAME okularcore EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h")
 
 # Special handling for linking okularcore on OSX/Apple
 IF(APPLE)
diff --git a/interfaces/configinterface.h b/interfaces/configinterface.h
index d5e64336e..1f4cdc923 100644
--- a/interfaces/configinterface.h
+++ b/interfaces/configinterface.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_CONFIGINTERFACE_H_
 #define _OKULAR_CONFIGINTERFACE_H_
 
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
 
 #include <QtCore/QObject>
 
diff --git a/interfaces/guiinterface.h b/interfaces/guiinterface.h
index 4b4dca0c8..deb076944 100644
--- a/interfaces/guiinterface.h
+++ b/interfaces/guiinterface.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_GUIINTERFACE_H_
 #define _OKULAR_GUIINTERFACE_H_
 
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
 
 #include <QtCore/QObject>
 
diff --git a/interfaces/printinterface.h b/interfaces/printinterface.h
index 460d33eb4..919a0d745 100644
--- a/interfaces/printinterface.h
+++ b/interfaces/printinterface.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_PRINTINTERFACE_H_
 #define _OKULAR_PRINTINTERFACE_H_
 
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
 
 #include <QtCore/QObject>
 
diff --git a/interfaces/saveinterface.h b/interfaces/saveinterface.h
index 8ae1bea64..95e7ccb49 100644
--- a/interfaces/saveinterface.h
+++ b/interfaces/saveinterface.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_SAVEINTERFACE_H_
 #define _OKULAR_SAVEINTERFACE_H_
 
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
 
 #include <QtCore/QObject>
 
diff --git a/interfaces/viewerinterface.h b/interfaces/viewerinterface.h
index c174059d7..7245497d2 100644
--- a/interfaces/viewerinterface.h
+++ b/interfaces/viewerinterface.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_VIEWERINTERFACE_H_
 #define _OKULAR_VIEWERINTERFACE_H_
 
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QString>