diff --git a/sources/configdialog.cpp b/sources/configdialog.cpp
index a0cac6fc2..ed9dd3a6c 100644
--- a/sources/configdialog.cpp
+++ b/sources/configdialog.cpp
@@ -17,7 +17,7 @@
 */
 #include <QScrollArea>
 #include "configdialog.h"
-#include "configpages.h"
+#include "ui/configpage/configpages.h"
 #include "qetapp.h"
 
 #include "machine_info.h"
diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp
index 217066f56..7c90c0a05 100644
--- a/sources/qetapp.cpp
+++ b/sources/qetapp.cpp
@@ -18,7 +18,7 @@
 #include "qetapp.h"
 
 #include "configdialog.h"
-#include "configpages.h"
+#include "ui/configpage/configpages.h"
 #include "editor/ui/qetelementeditor.h"
 #include "elementscollectioncache.h"
 #include "factory/elementfactory.h"
diff --git a/sources/ui/configpage/configpages.cpp b/sources/ui/configpage/configpages.cpp
index 2ecde2345..6efd69193 100644
--- a/sources/ui/configpage/configpages.cpp
+++ b/sources/ui/configpage/configpages.cpp
@@ -18,18 +18,18 @@
 
 #include "configpages.h"
 
-#include "NameList/nameslist.h"
-#include "bordertitleblock.h"
-#include "exportpropertieswidget.h"
-#include "properties/reportproperties.h"
-#include "qetapp.h"
-#include "qeticons.h"
-#include "qetproject.h"
-#include "ui/borderpropertieswidget.h"
-#include "ui/conductorpropertieswidget.h"
-#include "ui/reportpropertiewidget.h"
-#include "ui/titleblockpropertieswidget.h"
-#include "ui/xrefpropertieswidget.h"
+#include "../NameList/nameslist.h"
+#include "../bordertitleblock.h"
+#include "../exportpropertieswidget.h"
+#include "../properties/reportproperties.h"
+#include "../qetapp.h"
+#include "../qeticons.h"
+#include "../qetproject.h"
+#include "../borderpropertieswidget.h"
+#include "../conductorpropertieswidget.h"
+#include "../reportpropertiewidget.h"
+#include "../titleblockpropertieswidget.h"
+#include "../xrefpropertieswidget.h"
 
 #include <QFont>
 #include <QFontDialog>
diff --git a/sources/ui/configpage/configpages.h b/sources/ui/configpage/configpages.h
index df8ce991d..20c71b6ba 100644
--- a/sources/ui/configpage/configpages.h
+++ b/sources/ui/configpage/configpages.h
@@ -18,8 +18,8 @@
 #ifndef CONFIG_PAGES_H
 #define CONFIG_PAGES_H
 #include "configpage.h"
-#include "ui/projectpropertiesdialog.h"
-#include "ui/titleblockpropertieswidget.h"
+#include "../projectpropertiesdialog.h"
+#include "../titleblockpropertieswidget.h"
 
 #include <QDialog>
 #include <QtWidgets>
diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h
index 492ef8f68..a932fc71d 100644
--- a/sources/ui/configpage/generalconfigurationpage.h
+++ b/sources/ui/configpage/generalconfigurationpage.h
@@ -18,7 +18,7 @@
 #ifndef GENERALCONFIGURATIONPAGE_H
 #define GENERALCONFIGURATIONPAGE_H
 
-#include "../../configpage.h"
+#include "configpage.h"
 
 #include <QWidget>
 
diff --git a/sources/ui/configpage/projectconfigpages.cpp b/sources/ui/configpage/projectconfigpages.cpp
index 547b6b9d5..b8aa4eb93 100644
--- a/sources/ui/configpage/projectconfigpages.cpp
+++ b/sources/ui/configpage/projectconfigpages.cpp
@@ -17,19 +17,19 @@
 */
 #include "projectconfigpages.h"
 
-#include "autoNum/numerotationcontext.h"
-#include "autoNum/ui/autonumberingmanagementw.h"
-#include "autoNum/ui/folioautonumbering.h"
-#include "autoNum/ui/formulaautonumberingw.h"
-#include "autoNum/ui/selectautonumw.h"
-#include "qeticons.h"
-#include "qetproject.h"
-#include "ui/borderpropertieswidget.h"
-#include "ui/conductorpropertieswidget.h"
-#include "ui/diagramcontextwidget.h"
-#include "ui/reportpropertiewidget.h"
-#include "ui/titleblockpropertieswidget.h"
-#include "ui/xrefpropertieswidget.h"
+#include "../autoNum/numerotationcontext.h"
+#include "../autoNum/ui/autonumberingmanagementw.h"
+#include "../autoNum/ui/folioautonumbering.h"
+#include "../autoNum/ui/formulaautonumberingw.h"
+#include "../autoNum/ui/selectautonumw.h"
+#include "../qeticons.h"
+#include "../qetproject.h"
+#include "../borderpropertieswidget.h"
+#include "../conductorpropertieswidget.h"
+#include "../diagramcontextwidget.h"
+#include "../reportpropertiewidget.h"
+#include "../titleblockpropertieswidget.h"
+#include "../xrefpropertieswidget.h"
 
 //#include "ui_autonumberingmanagementw.h"
 
diff --git a/sources/ui/projectpropertiesdialog.cpp b/sources/ui/projectpropertiesdialog.cpp
index b0cd2093d..5ee49b892 100644
--- a/sources/ui/projectpropertiesdialog.cpp
+++ b/sources/ui/projectpropertiesdialog.cpp
@@ -18,8 +18,8 @@
 #include "projectpropertiesdialog.h"
 
 #include "../configdialog.h"
-#include "../configpages.h"
-#include "../projectconfigpages.h"
+#include "configpage/configpages.h"
+#include "configpage/projectconfigpages.h"
 
 #include <QObject>