8 files changed, 13 insertions, 9 deletions
diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
index 753642f8c..b938ab3e4 100644
--- a/src/settings/dolphin_directoryviewpropertysettings.kcfgc
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -3,4 +3,4 @@ Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true
 GlobalEnums=true
-IncludeFiles=dolphinview.h,qnamespace.h
+IncludeFiles=views/dolphinview.h,qnamespace.h
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 1e1c6ed87..d891558e1 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
-#include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"
@@ -39,6 +38,8 @@
 #include <QPushButton>
 #include <QRadioButton>
 
+#include "views/dolphinview.h"
+
 StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
diff --git a/src/settings/viewmodes/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp
index aac28f0fd..2a6265f2f 100644
--- a/src/settings/viewmodes/columnviewsettingspage.cpp
+++ b/src/settings/viewmodes/columnviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "dolphinfontrequester.h"
 #include <dolphin_columnmodesettings.h>
 #include "iconsizegroupbox.h"
-#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -38,6 +37,8 @@
 #include <QSlider>
 #include <QRadioButton>
 
+#include <views/zoomlevelinfo.h>
+
 ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
diff --git a/src/settings/viewmodes/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index 67cef32fe..253d12a79 100644
--- a/src/settings/viewmodes/detailsviewsettingspage.cpp
+++ b/src/settings/viewmodes/detailsviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "iconsizegroupbox.h"
 #include "dolphinfontrequester.h"
 #include "dolphin_detailsmodesettings.h"
-#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -36,7 +35,9 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QRadioButton>
-#include <QtGui/QSpinBox>
+#include <QSpinBox>
+
+#include <views/zoomlevelinfo.h>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
diff --git a/src/settings/viewmodes/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index d8e0e889a..900c75b2c 100644
--- a/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -29,7 +29,7 @@
 #include <QRect>
 #include <QSlider>
 
-#include "zoomlevelinfo.h"
+#include <views/zoomlevelinfo.h>
 
 IconSizeGroupBox::IconSizeGroupBox(QWidget* parent) :
     QGroupBox(i18nc("@title:group", "Icon Size"), parent),
diff --git a/src/settings/viewmodes/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index 059a4a846..a01b4a2db 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
@@ -22,7 +22,6 @@
 #include "dolphinfontrequester.h"
 #include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"
-#include "zoomlevelinfo.h"
 
 #include "dolphin_iconsmodesettings.h"
 
@@ -41,6 +40,8 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 
+#include <views/zoomlevelinfo.h>
+
 IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
     m_iconSizeGroupBox(0),
diff --git a/src/settings/viewmodes/iconsviewsettingspage.h b/src/settings/viewmodes/iconsviewsettingspage.h
index 17fda4e26..9a1a9e8b4 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.h
+++ b/src/settings/viewmodes/iconsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef ICONSVIEWSETTINGSPAGE_H
 #define ICONSVIEWSETTINGSPAGE_H
 
-#include <dolphiniconsview.h>
+#include <views/dolphiniconsview.h>
 #include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 3941a61cc..6e4efab1b 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,7 +21,7 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "dolphinview.h"
+#include "views/dolphinview.h"
 #include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"