diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 767cf7fe3..ce629fb9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Baloo 4.97)
+find_package(KF5Baloo 4.97)
 set_package_properties(Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
                        URL "http://www.kde.org"
                        TYPE OPTIONAL
@@ -18,7 +18,7 @@ set_package_properties(KFileMetaData PROPERTIES
                        PURPOSE "For accessing file metadata labels"
                       )
 
-if (Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
+if (KF5Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
     set(HAVE_BALOO TRUE)
 endif()
 
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index acb3e0f99..b62ff7859 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -44,9 +44,9 @@
 
 #ifdef HAVE_BALOO
     #include "private/kbaloorolesprovider.h"
-    #include <baloo/file.h>
-    #include <baloo/filefetchjob.h>
-    #include <baloo/filemonitor.h>
+    #include <KF5/Baloo/file.h>
+    #include <KF5/Baloo/filefetchjob.h>
+    #include <KF5/Baloo/filemonitor.h>
 #endif
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index c0ae0c544..ea67dfbad 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -24,7 +24,7 @@
 #include <KGlobal>
 #include <KLocale>
 
-#include <baloo/file.h>
+#include <KF5/Baloo/file.h>
 #include <kfilemetadata/propertyinfo.h>
 
 #include <QTime>
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 6ba91c5ba..d4dce607a 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -53,8 +53,8 @@
 #include <views/viewproperties.h>
 
 #ifdef HAVE_BALOO
-    #include <baloo/query.h>
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/query.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 namespace {
diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 757dcd482..16d497918 100644
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -24,7 +24,7 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
-    #include <baloo/term.h>
+    #include <KF5/Baloo/term.h>
 #endif
 
 class QButtonGroup;
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index df96f7434..1f946f513 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -42,9 +42,9 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
-    #include <baloo/query.h>
-    #include <baloo/term.h>
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/query.h>
+    #include <KF5/Baloo/term.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index db9258ae8..2569acc49 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -28,7 +28,7 @@
 #include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 0e43dcda1..df9a52db1 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -79,7 +79,7 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 namespace {
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 3955f250d..ecf5d2334 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -44,7 +44,7 @@
 #include <KDebug>
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :