diff --git a/autotests/datasourcetest.cpp b/autotests/datasourcetest.cpp
index 454a047e09a85ab357fc9a45e439ee4fbb6fa88b..e815403675544c3db7c391a08eecc53be47338bf 100644
--- a/autotests/datasourcetest.cpp
+++ b/autotests/datasourcetest.cpp
@@ -15,17 +15,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/applicationversionsource.h>
-#include <provider/core/compilerinfosource.h>
-#include <provider/core/cpuinfosource.h>
-#include <provider/core/localeinfosource.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/propertyratiosource.h>
-#include <provider/core/qtversionsource.h>
-#include <provider/core/screeninfosource.h>
-#include <provider/core/startcountsource.h>
-#include <provider/core/usagetimesource.h>
-#include <provider/core/openglinfosource.h>
+#include <applicationversionsource.h>
+#include <compilerinfosource.h>
+#include <cpuinfosource.h>
+#include <localeinfosource.h>
+#include <platforminfosource.h>
+#include <propertyratiosource.h>
+#include <qtversionsource.h>
+#include <screeninfosource.h>
+#include <startcountsource.h>
+#include <usagetimesource.h>
+#include <openglinfosource.h>
 
 #include <QDebug>
 #include <QtTest/qtest.h>
diff --git a/autotests/feedbackconfigtest.cpp b/autotests/feedbackconfigtest.cpp
index cd0fc0dd015869079c915ba553fb49a441be9776..b8de4f6fa727c11893b7be22bf89366de110132a 100644
--- a/autotests/feedbackconfigtest.cpp
+++ b/autotests/feedbackconfigtest.cpp
@@ -15,10 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/feedbackconfigwidget.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/provider.h>
-#include <provider/core/screeninfosource.h>
+#include <feedbackconfigwidget.h>
+#include <platforminfosource.h>
+#include <provider.h>
+#include <screeninfosource.h>
 
 #include <QDebug>
 #include <QLabel>
diff --git a/autotests/providertest.cpp b/autotests/providertest.cpp
index ce084ffa7a381cb3e4e5f1de35bfe013827fa7c1..5dbdd4e2d94613dad9bd35f318e230c45bf33cc8 100644
--- a/autotests/providertest.cpp
+++ b/autotests/providertest.cpp
@@ -15,10 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/provider.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/screeninfosource.h>
-#include <provider/core/startcountsource.h>
+#include <provider.h>
+#include <platforminfosource.h>
+#include <screeninfosource.h>
+#include <startcountsource.h>
 
 #include <QDebug>
 #include <QtTest/qtest.h>
diff --git a/autotests/selectionratiosourcetest.cpp b/autotests/selectionratiosourcetest.cpp
index 7a6888052eafabbf31ec313e096087824185b465..148fb5e4d60daaf3e6bc495c685e2fb142793dfd 100644
--- a/autotests/selectionratiosourcetest.cpp
+++ b/autotests/selectionratiosourcetest.cpp
@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/core/selectionratiosource.h>
+#include <selectionratiosource.h>
 
 #include <QDebug>
 #include <QItemSelectionModel>
diff --git a/src/provider/core/CMakeLists.txt b/src/provider/core/CMakeLists.txt
index 9b3a3aac520baa23fb02e7ce76b5bd0836e5852b..26c461f09964596635fa5152dfaa33d2d02e6c28 100644
--- a/src/provider/core/CMakeLists.txt
+++ b/src/provider/core/CMakeLists.txt
@@ -35,7 +35,7 @@ else()
     target_link_libraries(UserFeedbackCore PUBLIC ${QT_QTCORE_LIBRARIES} PRIVATE ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES})
 endif()
 target_link_libraries(UserFeedbackCore PRIVATE UserFeedbackCommon)
-target_include_directories(UserFeedbackCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR};${CMAKE_SOURCE_DIR}/src>")
+target_include_directories(UserFeedbackCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}>")
 target_include_directories(UserFeedbackCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/UserFeedback;${KDE_INSTALL_INCLUDEDIR}>")
 
 ecm_generate_headers(UserFeedbackCore_HEADERS
diff --git a/src/provider/widgets/feedbackconfigdialog.cpp b/src/provider/widgets/feedbackconfigdialog.cpp
index 3e7f1bacfd6b8d95a46f1b9ba7e2ca6e4fb080c2..94dc46c44424e820d0787b3b3fdbc10768473de3 100644
--- a/src/provider/widgets/feedbackconfigdialog.cpp
+++ b/src/provider/widgets/feedbackconfigdialog.cpp
@@ -18,7 +18,7 @@
 #include "feedbackconfigdialog.h"
 #include "ui_feedbackconfigdialog.h"
 
-#include <provider/core/provider.h>
+#include <provider.h>
 
 #include <QDebug>
 #include <QPushButton>
diff --git a/src/provider/widgets/feedbackconfigwidget.cpp b/src/provider/widgets/feedbackconfigwidget.cpp
index 299803b987f19fe608867b6f0fe43797fa960b40..3d04a60197a28d3bc1ea967ad81f4b46818d0a9b 100644
--- a/src/provider/widgets/feedbackconfigwidget.cpp
+++ b/src/provider/widgets/feedbackconfigwidget.cpp
@@ -18,8 +18,8 @@
 #include "feedbackconfigwidget.h"
 #include "ui_feedbackconfigwidget.h"
 
-#include <provider/core/abstractdatasource.h>
-#include <provider/core/provider.h>
+#include <abstractdatasource.h>
+#include <provider.h>
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/provider/widgets/notificationpopup.cpp b/src/provider/widgets/notificationpopup.cpp
index 2d0e8b60ff1c11afb484aef30a237bc4d60c2130..7d69751e490992f2e89c330454ef9531140b53f6 100644
--- a/src/provider/widgets/notificationpopup.cpp
+++ b/src/provider/widgets/notificationpopup.cpp
@@ -19,8 +19,8 @@
 #include "ui_notificationpopup.h"
 #include "feedbackconfigdialog.h"
 
-#include <provider/core/provider.h>
-#include <provider/core/surveyinfo.h>
+#include <provider.h>
+#include <surveyinfo.h>
 
 #include <QApplication>
 #include <QDebug>
diff --git a/tests/feedbackconfigwidgettest.cpp b/tests/feedbackconfigwidgettest.cpp
index 57b35a7db864b502d7337bba49cfd0ca2ec80dab..28e8409e07b5cebfd442b7816fa576830669ced0 100644
--- a/tests/feedbackconfigwidgettest.cpp
+++ b/tests/feedbackconfigwidgettest.cpp
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/feedbackconfigdialog.h>
+#include <feedbackconfigdialog.h>
 
-#include <provider/core/applicationversionsource.h>
-#include <provider/core/platforminfosource.h>
-#include <provider/core/provider.h>
-#include <provider/core/qtversionsource.h>
-#include <provider/core/screeninfosource.h>
+#include <applicationversionsource.h>
+#include <platforminfosource.h>
+#include <provider.h>
+#include <qtversionsource.h>
+#include <screeninfosource.h>
 
 #include <QApplication>
 #include <QStandardPaths>
diff --git a/tests/notificationpopuptest.cpp b/tests/notificationpopuptest.cpp
index 0204ee0e0bf51cabb200b5cc0242915851c418f2..24708f8e74a092b749a6674d9c89af0ac915013b 100644
--- a/tests/notificationpopuptest.cpp
+++ b/tests/notificationpopuptest.cpp
@@ -15,9 +15,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <provider/widgets/notificationpopup.h>
-#include <provider/core/provider.h>
-#include <provider/core/surveyinfo.h>
+#include <notificationpopup.h>
+#include <provider.h>
+#include <surveyinfo.h>
 
 #include <QApplication>
 #include <QPushButton>