diff --git a/components/settings/categories/camera.hpp b/components/settings/categories/camera.hpp
index 4712f88b45..5b3a9b742b 100644
--- a/components/settings/categories/camera.hpp
+++ b/components/settings/categories/camera.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/cells.hpp b/components/settings/categories/cells.hpp
index 723004d674..86fe944acf 100644
--- a/components/settings/categories/cells.hpp
+++ b/components/settings/categories/cells.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/fog.hpp b/components/settings/categories/fog.hpp
index 5acf3d20c6..3bc75587f1 100644
--- a/components/settings/categories/fog.hpp
+++ b/components/settings/categories/fog.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/game.hpp b/components/settings/categories/game.hpp
index ded367a54c..5b400acb50 100644
--- a/components/settings/categories/game.hpp
+++ b/components/settings/categories/game.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 
-#include "components/detournavigator/collisionshapetype.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/detournavigator/collisionshapetype.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/general.hpp b/components/settings/categories/general.hpp
index 7bbb651ee8..a79ef83ea0 100644
--- a/components/settings/categories/general.hpp
+++ b/components/settings/categories/general.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/groundcover.hpp b/components/settings/categories/groundcover.hpp
index 48f97037ae..78615a4e76 100644
--- a/components/settings/categories/groundcover.hpp
+++ b/components/settings/categories/groundcover.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/gui.hpp b/components/settings/categories/gui.hpp
index 1d3a56af39..af438d5ddc 100644
--- a/components/settings/categories/gui.hpp
+++ b/components/settings/categories/gui.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/hud.hpp b/components/settings/categories/hud.hpp
index e97a81501d..fe05e39eda 100644
--- a/components/settings/categories/hud.hpp
+++ b/components/settings/categories/hud.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/input.hpp b/components/settings/categories/input.hpp
index 1e59b45334..0a450f1dcd 100644
--- a/components/settings/categories/input.hpp
+++ b/components/settings/categories/input.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/lua.hpp b/components/settings/categories/lua.hpp
index da11a605eb..88d74b2d1f 100644
--- a/components/settings/categories/lua.hpp
+++ b/components/settings/categories/lua.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/map.hpp b/components/settings/categories/map.hpp
index bdccd6f205..8a80d5aa63 100644
--- a/components/settings/categories/map.hpp
+++ b/components/settings/categories/map.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 
-#include "components/misc/constants.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/misc/constants.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/models.hpp b/components/settings/categories/models.hpp
index fec8da7775..0d26eeba5f 100644
--- a/components/settings/categories/models.hpp
+++ b/components/settings/categories/models.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/navigator.hpp b/components/settings/categories/navigator.hpp
index b820b2c950..d6d7adcd56 100644
--- a/components/settings/categories/navigator.hpp
+++ b/components/settings/categories/navigator.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
 #include <components/settings/navmeshrendermode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/physics.hpp b/components/settings/categories/physics.hpp
index 41005a06cf..4720708db2 100644
--- a/components/settings/categories/physics.hpp
+++ b/components/settings/categories/physics.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/postprocessing.hpp b/components/settings/categories/postprocessing.hpp
index 04810b847c..7f5ddfba3e 100644
--- a/components/settings/categories/postprocessing.hpp
+++ b/components/settings/categories/postprocessing.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/saves.hpp b/components/settings/categories/saves.hpp
index e565d98564..3a64785412 100644
--- a/components/settings/categories/saves.hpp
+++ b/components/settings/categories/saves.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/shaders.hpp b/components/settings/categories/shaders.hpp
index 7efb891822..dce2531c1e 100644
--- a/components/settings/categories/shaders.hpp
+++ b/components/settings/categories/shaders.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 
-#include "components/sceneutil/lightingmethod.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/sceneutil/lightingmethod.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/shadows.hpp b/components/settings/categories/shadows.hpp
index d716272bce..0da6f649c4 100644
--- a/components/settings/categories/shadows.hpp
+++ b/components/settings/categories/shadows.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/sound.hpp b/components/settings/categories/sound.hpp
index 43313e622d..995bce2a58 100644
--- a/components/settings/categories/sound.hpp
+++ b/components/settings/categories/sound.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 
-#include "components/settings/hrtfmode.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/hrtfmode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <string>
 
diff --git a/components/settings/categories/stereo.hpp b/components/settings/categories/stereo.hpp
index 98fae8693f..aa903c5b53 100644
--- a/components/settings/categories/stereo.hpp
+++ b/components/settings/categories/stereo.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/stereoview.hpp b/components/settings/categories/stereoview.hpp
index bcd0f57abc..7f08d9bc35 100644
--- a/components/settings/categories/stereoview.hpp
+++ b/components/settings/categories/stereoview.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/terrain.hpp b/components/settings/categories/terrain.hpp
index c2eef9dc20..f26cc264b8 100644
--- a/components/settings/categories/terrain.hpp
+++ b/components/settings/categories/terrain.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/video.hpp b/components/settings/categories/video.hpp
index 0e0f7a75bb..cb12ea079c 100644
--- a/components/settings/categories/video.hpp
+++ b/components/settings/categories/video.hpp
@@ -1,13 +1,12 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 
+#include <components/sdlutil/vsyncmode.hpp>
 #include <components/settings/sanitizerimpl.hpp>
 #include <components/settings/screenshotsettings.hpp>
 #include <components/settings/settingvalue.hpp>
 #include <components/settings/windowmode.hpp>
 
-#include <components/sdlutil/vsyncmode.hpp>
-
 #include <osg/Math>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
diff --git a/components/settings/categories/water.hpp b/components/settings/categories/water.hpp
index b88d38b023..2e04114244 100644
--- a/components/settings/categories/water.hpp
+++ b/components/settings/categories/water.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>
diff --git a/components/settings/categories/windows.hpp b/components/settings/categories/windows.hpp
index 1fc249cc97..2f22e751e6 100644
--- a/components/settings/categories/windows.hpp
+++ b/components/settings/categories/windows.hpp
@@ -1,8 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>