diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@
 )
 
 # include optional and extra cmake stuff
-include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(KDEInstallDirs)
@@ -46,6 +45,9 @@
 include(ECMAddQch)
 include(ECMQtDeclareLoggingCategory)
 include(ECMMarkNonGuiExecutable)
+include(ECMGenerateExportHeader)
+
+set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -55,7 +55,15 @@
 )
 target_include_directories(KF5Baloo INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/Baloo>")
 
-generate_export_header(KF5Baloo BASE_NAME BALOO_CORE EXPORT_FILE_NAME core_export.h)
+ecm_generate_export_header(KF5Baloo
+    EXPORT_FILE_NAME core_export.h
+    BASE_NAME BALOO_CORE
+    # GROUP_BASE_NAME KF <- enable once all of KF modules use ecm_generate_export_header
+    VERSION ${KF5_VERSION}
+    DEPRECATED_BASE_VERSION 0
+    DEPRECATION_VERSIONS 5.55
+    EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
+)
 
 ecm_generate_headers(KF5Baloo_CamelCase_HEADERS
     HEADER_NAMES
diff --git a/src/lib/resultiterator.h b/src/lib/resultiterator.h
--- a/src/lib/resultiterator.h
+++ b/src/lib/resultiterator.h
@@ -42,9 +42,15 @@
     ResultIterator(ResultIterator &&rhs);
     ~ResultIterator();
 
-    // TODO KF6 mark this as delete
-    /** Do not use this function, ResultIterator is not copiable, move it if needed */
-    BALOO_CORE_DEPRECATED ResultIterator(const ResultIterator& rhs);
+#if BALOO_CORE_BUILD_DEPRECATED_SINCE(5, 55)
+    /**
+     * @deprecated Since 5.55. Do not use this function, ResultIterator is not copyable, move it if needed
+     */
+    BALOO_CORE_DEPRECATED_VERSION(5, 55, "Do not use. ResultIterator is not copyable, move it if needed.")
+    ResultIterator(const ResultIterator& rhs);
+#else
+    ResultIterator(const ResultIterator& rhs) = delete;
+#endif
     ResultIterator &operator=(const ResultIterator& rhs) = delete;
 
     bool next();
diff --git a/src/lib/resultiterator.cpp b/src/lib/resultiterator.cpp
--- a/src/lib/resultiterator.cpp
+++ b/src/lib/resultiterator.cpp
@@ -45,13 +45,13 @@
     d->pos = -1;
 }
 
-// TODO Remove for KF6
+#if BALOO_CORE_BUILD_DEPRECATED_SINCE(5, 55)
 ResultIterator::ResultIterator(const ResultIterator& rhs)
     : d(new ResultIteratorPrivate)
 {
     d->results = rhs.d->results;
 }
-
+#endif
 
 ResultIterator::ResultIterator(ResultIterator &&rhs)
     : d(rhs.d)