diff --git a/src/plugins/qmljstools/qmljscodestylepreferences.h b/src/plugins/qmljstools/qmljscodestylepreferences.h
index 2c3d2e5d515..3f3b75475de 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferences.h
+++ b/src/plugins/qmljstools/qmljscodestylepreferences.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "qmljstools_global.h"
+
 #include "qmljscodestylesettings.h"
 
 #include <texteditor/icodestylepreferences.h>
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
index f054a37bd43..5dbfd1ca96a 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
@@ -24,11 +24,12 @@
 ****************************************************************************/
 
 #include "qmljscodestylepreferencesfactory.h"
-#include "qmljscodestylesettingspage.h"
-#include "qmljstoolsconstants.h"
-#include "qmljsindenter.h"
 
-#include <qmljscodestylepreferences.h>
+#include "qmljscodestylepreferences.h"
+#include "qmljscodestylesettingspage.h"
+#include "qmljsindenter.h"
+#include "qmljstoolsconstants.h"
+
 
 #include <qmljseditor/qmljseditorconstants.h>
 
diff --git a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp
index 656cdba06d6..c7fac08af69 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp
@@ -24,12 +24,13 @@
 ****************************************************************************/
 
 #include "qmljscodestylepreferenceswidget.h"
-#include "qmljscodestylepreferences.h"
-#include "qmljscodestylesettingswidget.h"
-#include "qmljscodestylesettings.h"
 
-#include <QVBoxLayout>
+#include "qmljscodestylepreferences.h"
+#include "qmljscodestylesettings.h"
+#include "qmljscodestylesettingswidget.h"
+
 #include <QLabel>
+#include <QVBoxLayout>
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h
index dd3ae21e801..12861bda5ee 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h
+++ b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h
@@ -38,8 +38,6 @@ class QmlJSCodeStyleSettings;
 class QmlJSCodeStyleSettingsWidget;
 class QmlJSCodeStylePreferences;
 
-namespace Ui { class TabPreferencesWidget; }
-
 class QMLJSTOOLS_EXPORT QmlJSCodeStylePreferencesWidget : public QWidget
 {
     Q_OBJECT
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index a44ecf229d4..9113d0f559b 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -24,22 +24,23 @@
 ****************************************************************************/
 
 #include "qmljscodestylesettingspage.h"
-#include "ui_qmljscodestylesettingspage.h"
-#include "qmljstoolsconstants.h"
-#include "qmljstoolssettings.h"
+
+#include "qmljscodestylepreferences.h"
 #include "qmljsindenter.h"
 #include "qmljsqtstylecodeformatter.h"
-#include "qmljscodestylepreferences.h"
+#include "qmljstoolsconstants.h"
+#include "qmljstoolssettings.h"
+#include "ui_qmljscodestylesettingspage.h"
 
+#include <coreplugin/icore.h>
+#include <extensionsystem/pluginmanager.h>
+#include <qmljseditor/qmljseditorconstants.h>
+#include <texteditor/codestyleeditor.h>
+#include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/snippets/snippetprovider.h>
 #include <texteditor/tabsettings.h>
-#include <texteditor/displaysettings.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/codestyleeditor.h>
-#include <extensionsystem/pluginmanager.h>
-#include <qmljseditor/qmljseditorconstants.h>
-#include <coreplugin/icore.h>
 
 #include <QTextStream>
 
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.ui b/src/plugins/qmljstools/qmljscodestylesettingspage.ui
index 90262704ef8..acb034c71fd 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.ui
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.ui
@@ -80,7 +80,7 @@ Rectangle {
   <customwidget>
    <class>QmlJSTools::QmlJSCodeStylePreferencesWidget</class>
    <extends>QWidget</extends>
-   <header location="global">qmljscodestylepreferenceswidget.h</header>
+   <header location="global">qmljstools/qmljscodestylepreferenceswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
index 1dfbfc324fc..7cb7eb2dc50 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp
@@ -24,8 +24,9 @@
 ****************************************************************************/
 
 #include "qmljscodestylesettingswidget.h"
-#include "ui_qmljscodestylesettingswidget.h"
+
 #include "qmljscodestylesettings.h"
+#include "ui_qmljscodestylesettingswidget.h"
 
 #include <QTextStream>
 
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 96c0b359b25..b619d9aeada 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -19,11 +19,20 @@ QtcPlugin {
     files: [
         "qmljsbundleprovider.cpp",
         "qmljsbundleprovider.h",
+        "qmljscodestylepreferences.cpp",
+        "qmljscodestylepreferences.h",
         "qmljscodestylepreferencesfactory.cpp",
         "qmljscodestylepreferencesfactory.h",
+        "qmljscodestylepreferenceswidget.cpp",
+        "qmljscodestylepreferenceswidget.h",
+        "qmljscodestylesettings.cpp",
+        "qmljscodestylesettings.h",
         "qmljscodestylesettingspage.cpp",
         "qmljscodestylesettingspage.h",
         "qmljscodestylesettingspage.ui",
+        "qmljscodestylesettingswidget.cpp",
+        "qmljscodestylesettingswidget.h",
+        "qmljscodestylesettingswidget.ui",
         "qmljsfunctionfilter.cpp",
         "qmljsfunctionfilter.h",
         "qmljsindenter.cpp",