diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 1fe7f9251c7a6826ec2d019b3b5ff16737fffaf0..bcf06176a4dbfaa8a15b0c2c7684010377dac690 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -45,6 +45,7 @@ ecm_generate_headers(KF5AkonadiSearchCore_CamelCasecore_HEADERS
     Term
     Query
     ResultIterator
+    SearchStore
     REQUIRED_HEADERS KF5AkonadiSearchCore_core_HEADERS
     PREFIX Core
     )
@@ -53,21 +54,16 @@ install(TARGETS KF5AkonadiSearchCore EXPORT KF5AkonadiSearchTargets ${KF5_INSTAL
 
 install(FILES
     ${KF5AkonadiSearchCore_CamelCasecore_HEADERS}
-    ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch/Core
     COMPONENT Devel
 )
 install(FILES
     ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch/core
     COMPONENT Devel
 )
 
 install(FILES
-    ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     ${CMAKE_CURRENT_BINARY_DIR}/search_core_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch
     COMPONENT Devel
diff --git a/xapian/xapiansearchstore.h b/xapian/xapiansearchstore.h
index 83187afb9cc65b859061f68410c31b013a7c38b5..bf3b2ab901f952f261e08d7c4828ba0eca1c205b 100644
--- a/xapian/xapiansearchstore.h
+++ b/xapian/xapiansearchstore.h
@@ -10,9 +10,9 @@
 
 #include <xapian.h>
 
+#include "core/searchstore.h"
+#include "core/term.h"
 #include "search_xapian_export.h"
-#include "searchstore.h"
-#include "term.h"
 
 #include <QMutex>