diff --git a/core/input_map.cpp b/core/input_map.cpp
index 1abe0191671..24d0624e98f 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "input_map.h"
 
-#include "project_settings.h"
 #include "os/keyboard.h"
+#include "project_settings.h"
 
 InputMap *InputMap::singleton = NULL;
 
diff --git a/core/io/compression.cpp b/core/io/compression.cpp
index ca35ece8f54..139383710c3 100644
--- a/core/io/compression.cpp
+++ b/core/io/compression.cpp
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "compression.h"
-#include "project_settings.h"
 #include "os/copymem.h"
+#include "project_settings.h"
 #include "zip_io.h"
 
 #include "thirdparty/misc/fastlz.h"
diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp
index 2197b187eb2..8e719568e55 100644
--- a/core/io/file_access_memory.cpp
+++ b/core/io/file_access_memory.cpp
@@ -29,10 +29,10 @@
 /*************************************************************************/
 #include "file_access_memory.h"
 
-#include "project_settings.h"
 #include "map.h"
 #include "os/copymem.h"
 #include "os/dir_access.h"
+#include "project_settings.h"
 
 static Map<String, Vector<uint8_t> > *files = NULL;
 
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 46457d14258..aa67479d7ee 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "file_access_network.h"
-#include "project_settings.h"
 #include "io/ip.h"
 #include "marshalls.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 //#define DEBUG_PRINT(m_p) print_line(m_p)
 //#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec());
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp
index 81446a3886a..a3d33593ddd 100644
--- a/core/io/packet_peer.cpp
+++ b/core/io/packet_peer.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "packet_peer.h"
 
-#include "project_settings.h"
 #include "io/marshalls.h"
+#include "project_settings.h"
 /* helpers / binders */
 
 PacketPeer::PacketPeer() {
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 602cbe6f306..9aa16ed7e7d 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "resource_format_binary.h"
-#include "project_settings.h"
 #include "image.h"
 #include "io/file_access_compressed.h"
 #include "io/marshalls.h"
 #include "os/dir_access.h"
+#include "project_settings.h"
 #include "version.h"
 //#define print_bl(m_what) print_line(m_what)
 #define print_bl(m_what)
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp
index 58913b80ccc..314259b2e9c 100644
--- a/core/io/resource_saver.cpp
+++ b/core/io/resource_saver.cpp
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "resource_saver.h"
-#include "project_settings.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #include "resource_loader.h"
 #include "script_language.h"
 
diff --git a/core/math/face3.h b/core/math/face3.h
index 1cc94321c3e..3d02ae40145 100644
--- a/core/math/face3.h
+++ b/core/math/face3.h
@@ -115,20 +115,20 @@ bool Face3::intersects_aabb2(const Rect3 &p_aabb) const {
 	if (dist_a * dist_b > 0)
 		return false; //does not intersect the plane
 
-#define TEST_AXIS(m_ax)                                       \
-	{                                                         \
+#define TEST_AXIS(m_ax)                                            \
+	{                                                              \
 		real_t aabb_min = p_aabb.position.m_ax;                    \
 		real_t aabb_max = p_aabb.position.m_ax + p_aabb.size.m_ax; \
-		real_t tri_min, tri_max;                              \
-		for (int i = 0; i < 3; i++) {                         \
-			if (i == 0 || vertex[i].m_ax > tri_max)           \
-				tri_max = vertex[i].m_ax;                     \
-			if (i == 0 || vertex[i].m_ax < tri_min)           \
-				tri_min = vertex[i].m_ax;                     \
-		}                                                     \
-                                                              \
-		if (tri_max < aabb_min || aabb_max < tri_min)         \
-			return false;                                     \
+		real_t tri_min, tri_max;                                   \
+		for (int i = 0; i < 3; i++) {                              \
+			if (i == 0 || vertex[i].m_ax > tri_max)                \
+				tri_max = vertex[i].m_ax;                          \
+			if (i == 0 || vertex[i].m_ax < tri_min)                \
+				tri_min = vertex[i].m_ax;                          \
+		}                                                          \
+                                                                   \
+		if (tri_max < aabb_min || aabb_max < tri_min)              \
+			return false;                                          \
 	}
 
 	TEST_AXIS(x);
diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
index 484942bad58..391ae78c856 100644
--- a/core/os/dir_access.cpp
+++ b/core/os/dir_access.cpp
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "dir_access.h"
-#include "project_settings.h"
 #include "os/file_access.h"
 #include "os/memory.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 String DirAccess::_get_root_path() const {
 
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index 7f5a84843cd..3bd5ac3f417 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -31,8 +31,8 @@
 
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 #include "thirdparty/misc/md5.h"
 #include "thirdparty/misc/sha256.h"
diff --git a/core/os/input.cpp b/core/os/input.cpp
index 18d644668c2..a90a552d1db 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "input.h"
-#include "project_settings.h"
 #include "input_map.h"
 #include "os/os.h"
+#include "project_settings.h"
 Input *Input::singleton = NULL;
 
 Input *Input::get_singleton() {
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 07715f97184..43f781af55e 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -36,7 +36,6 @@
 #include "core_string_names.h"
 #include "func_ref.h"
 #include "geometry.h"
-#include "project_settings.h"
 #include "input_map.h"
 #include "io/config_file.h"
 #include "io/http_client.h"
@@ -54,6 +53,7 @@
 #include "os/main_loop.h"
 #include "packed_data_container.h"
 #include "path_remap.h"
+#include "project_settings.h"
 #include "translation.h"
 #include "undo_redo.h"
 
diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp
index dec41e79768..d19fe213f6b 100644
--- a/core/script_debugger_remote.cpp
+++ b/core/script_debugger_remote.cpp
@@ -29,10 +29,10 @@
 /*************************************************************************/
 #include "script_debugger_remote.h"
 
-#include "project_settings.h"
 #include "io/ip.h"
 #include "os/input.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 void ScriptDebuggerRemote::_send_video_memory() {
 
diff --git a/core/translation.cpp b/core/translation.cpp
index d782006ddcc..50694e4a2dc 100644
--- a/core/translation.cpp
+++ b/core/translation.cpp
@@ -29,9 +29,9 @@
 /*************************************************************************/
 #include "translation.h"
 
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 static const char *locale_list[] = {
 	"aa", //  Afar
diff --git a/editor/collada/collada.h b/editor/collada/collada.h
index 38e66a7e453..8945e14cce2 100644
--- a/editor/collada/collada.h
+++ b/editor/collada/collada.h
@@ -32,9 +32,9 @@
 #ifndef COLLADA_H
 #define COLLADA_H
 
-#include "project_settings.h"
 #include "io/xml_parser.h"
 #include "map.h"
+#include "project_settings.h"
 #include "scene/resources/material.h"
 
 class Collada {
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index fa90cd36b31..69d7475f4c2 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -29,10 +29,10 @@
 /*************************************************************************/
 #include "doc_data.h"
 
-#include "project_settings.h"
 #include "global_constants.h"
 #include "io/compression.h"
 #include "io/marshalls.h"
+#include "project_settings.h"
 #include "scene/resources/theme.h"
 #include "script_language.h"
 #include "version.h"
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index 399c22bf2ce..dde94cb334a 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -30,8 +30,8 @@
 #include "editor_autoload_settings.h"
 
 #include "editor_node.h"
-#include "project_settings.h"
 #include "global_constants.h"
+#include "project_settings.h"
 
 #define PREVIEW_LIST_MAX_SIZE 10
 
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index f8dbd9abe54..c82e8f1226e 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -31,10 +31,10 @@
 
 #include "editor_node.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "os/dir_access.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #include "scene/resources/packed_scene.h"
 
 void EditorHistory::_cleanup_history() {
diff --git a/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp
index 6ab1468b1d6..63bee330928 100644
--- a/editor/editor_plugin_settings.cpp
+++ b/editor/editor_plugin_settings.cpp
@@ -30,10 +30,10 @@
 #include "editor_plugin_settings.h"
 
 #include "editor_node.h"
-#include "project_settings.h"
 #include "io/config_file.h"
 #include "os/file_access.h"
 #include "os/main_loop.h"
+#include "project_settings.h"
 #include "scene/gui/margin_container.h"
 
 void EditorPluginSettings::_notification(int p_what) {
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 3a6b34b7b44..89fa004eb14 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -31,11 +31,11 @@
 
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "message_queue.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
 
diff --git a/editor/file_type_cache.cpp b/editor/file_type_cache.cpp
index 100ebe21cdc..728e80bba71 100644
--- a/editor/file_type_cache.cpp
+++ b/editor/file_type_cache.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "file_type_cache.h"
 
-#include "project_settings.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 
 FileTypeCache *FileTypeCache::singleton = NULL;
 
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index eacb1d2cd96..77ca1a51450 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -31,11 +31,11 @@
 
 #include "editor_node.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "os/dir_access.h"
 #include "os/file_access.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/main/viewport.h"
 
 bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir) {
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp
index 5bf2da99127..3626c6be591 100644
--- a/editor/import/editor_import_collada.cpp
+++ b/editor/import/editor_import_collada.cpp
@@ -554,10 +554,10 @@ static void _generate_tangents_and_binormals(const PoolVector<int> &p_indices, c
 			tangent = Vector3();
 		} else {
 			tangent = Vector3((t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r,
-							  (t2 * z1 - t1 * z2) * r)
+					(t2 * z1 - t1 * z2) * r)
 							  .normalized();
 			binormal = Vector3((s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r,
-							   (s1 * z2 - s2 * z1) * r)
+					(s1 * z2 - s2 * z1) * r)
 							   .normalized();
 		}
 
diff --git a/editor/io_plugins/editor_export_scene.cpp b/editor/io_plugins/editor_export_scene.cpp
index 390217053a2..6392b4a715b 100644
--- a/editor/io_plugins/editor_export_scene.cpp
+++ b/editor/io_plugins/editor_export_scene.cpp
@@ -30,11 +30,11 @@
 #include "editor_export_scene.h"
 #if 0
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/dir_access.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #include "scene/resources/packed_scene.h"
 
 Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
diff --git a/editor/io_plugins/editor_scene_import_plugin.cpp b/editor/io_plugins/editor_scene_import_plugin.cpp
index 5f0e928844b..aa96f731ce4 100644
--- a/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -31,10 +31,10 @@
 #if 0
 #include "editor/create_dialog.h"
 #include "editor/editor_node.h"
-#include "project_settings.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/3d/body_shape.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/navigation.h"
diff --git a/editor/io_plugins/editor_texture_import_plugin.cpp b/editor/io_plugins/editor_texture_import_plugin.cpp
index 842c43f4de3..095bc02fa0e 100644
--- a/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -33,10 +33,10 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor_atlas.h"
-#include "project_settings.h"
 #include "io/image_loader.h"
 #include "io/marshalls.h"
 #include "io/resource_saver.h"
+#include "project_settings.h"
 #include "scene/gui/button_group.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/margin_container.h"
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 82b03d3a19e..c4e79bf2639 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -31,10 +31,10 @@
 
 #include "editor/animation_editor.h"
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/keyboard.h"
+#include "project_settings.h"
 
 void AnimationPlayerEditor::_node_removed(Node *p_node) {
 
diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp
index 463b6360ad8..2703da12fec 100644
--- a/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -30,8 +30,8 @@
 #include "resource_preloader_editor_plugin.h"
 
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 
 void ResourcePreloaderEditor::_gui_input(Ref<InputEvent> p_event) {
 }
diff --git a/editor/plugins/sample_editor_plugin.cpp b/editor/plugins/sample_editor_plugin.cpp
index 0b99ab54609..739a8abb53a 100644
--- a/editor/plugins/sample_editor_plugin.cpp
+++ b/editor/plugins/sample_editor_plugin.cpp
@@ -31,8 +31,8 @@
 
 #if 0
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 
 
 
diff --git a/editor/plugins/sample_library_editor_plugin.cpp b/editor/plugins/sample_library_editor_plugin.cpp
index 04c805165f9..5ccfde15fff 100644
--- a/editor/plugins/sample_library_editor_plugin.cpp
+++ b/editor/plugins/sample_library_editor_plugin.cpp
@@ -32,8 +32,8 @@
 #include "sample_library_editor_plugin.h"
 
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 #include "sample_editor_plugin.h"
 #include "scene/main/viewport.h"
 
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index fa80894f7ba..6a010062f25 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -30,8 +30,8 @@
 #include "sprite_frames_editor_plugin.h"
 
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 #include "scene/3d/sprite_3d.h"
 
 void SpriteFramesEditor::_gui_input(Ref<InputEvent> p_event) {
diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp
index 70a1227c529..125d9064605 100644
--- a/editor/plugins/texture_editor_plugin.cpp
+++ b/editor/plugins/texture_editor_plugin.cpp
@@ -30,8 +30,8 @@
 #include "texture_editor_plugin.h"
 
 #include "editor/editor_settings.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 
 void TextureEditor::_gui_input(Ref<InputEvent> p_event) {
 }
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
index b498044a650..b9694dffcba 100644
--- a/editor/project_export.cpp
+++ b/editor/project_export.cpp
@@ -32,7 +32,6 @@
 #include "editor_data.h"
 #include "editor_node.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "io/image_loader.h"
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
@@ -40,6 +39,7 @@
 #include "os/dir_access.h"
 #include "os/file_access.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/scroll_container.h"
diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
index c3a3410717f..d81161ae942 100644
--- a/editor/script_create_dialog.cpp
+++ b/editor/script_create_dialog.cpp
@@ -31,9 +31,9 @@
 
 #include "editor/editor_scale.h"
 #include "editor_file_system.h"
-#include "project_settings.h"
 #include "io/resource_saver.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #include "script_language.h"
 
 void ScriptCreateDialog::_notification(int p_what) {
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index 2af3bd5f317..f4ed430d3dd 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -32,8 +32,8 @@
 #include "editor_node.h"
 #include "editor_profiler.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "main/performance.h"
+#include "project_settings.h"
 #include "property_editor.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index eec047cd9a6..d455e0cea9d 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -32,8 +32,8 @@
 #include "editor_file_system.h"
 #include "editor_node.h"
 #include "editor_settings.h"
-#include "project_settings.h"
 #include "os/keyboard.h"
+#include "project_settings.h"
 #include "scene/gui/margin_container.h"
 
 void EditorSettingsDialog::ok_pressed() {
diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm
index 4b137b7ffac..f2778e8165c 100644
--- a/platform/iphone/gl_view.mm
+++ b/platform/iphone/gl_view.mm
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #import "gl_view.h"
 
-#include "core/project_settings.h"
 #include "core/os/keyboard.h"
+#include "core/project_settings.h"
 #include "os_iphone.h"
 #include "servers/audio_server.h"
 
diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm
index e9c164393b6..6c95903241b 100644
--- a/platform/iphone/ios.mm
+++ b/platform/iphone/ios.mm
@@ -36,7 +36,7 @@ void iOS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &iOS::get_rate_url);
 };
 
-void iOS::alert(const char* p_alert, const char* p_title) {
+void iOS::alert(const char *p_alert, const char *p_title) {
 	UIAlertView *alert = [[[UIAlertView alloc] initWithTitle:[NSString stringWithUTF8String:p_title] message:[NSString stringWithUTF8String:p_alert] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil] autorelease];
 	[alert show];
 }
diff --git a/platform/osx/audio_driver_osx.cpp b/platform/osx/audio_driver_osx.cpp
index 05d23a93987..d7a91b16530 100644
--- a/platform/osx/audio_driver_osx.cpp
+++ b/platform/osx/audio_driver_osx.cpp
@@ -257,7 +257,6 @@ AudioDriverOSX::AudioDriverOSX() {
 	samples_in = NULL;
 };
 
-AudioDriverOSX::~AudioDriverOSX() {
-};
+AudioDriverOSX::~AudioDriverOSX(){};
 
 #endif
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp
index 8b3f939f1a4..04b6177c3c3 100644
--- a/scene/io/resource_format_image.cpp
+++ b/scene/io/resource_format_image.cpp
@@ -30,9 +30,9 @@
 #include "resource_format_image.h"
 
 #if 0
-#include "project_settings.h"
 #include "io/image_loader.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/resources/texture.h"
 RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_original_path, Error *r_error) {
 
diff --git a/scene/main/node.h b/scene/main/node.h
index cfd5c079219..1794cce9f6e 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -31,10 +31,10 @@
 #define NODE_H
 
 #include "class_db.h"
-#include "project_settings.h"
 #include "map.h"
 #include "object.h"
 #include "path_db.h"
+#include "project_settings.h"
 #include "scene/main/scene_tree.h"
 #include "script_language.h"
 
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 74c556931c0..afd4d793b9a 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "register_scene_types.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/io/resource_format_image.h"
 #include "scene/io/resource_format_wav.h"
 
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 01a8342fed0..6bf3590c12c 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "packed_scene.h"
 #include "core/core_string_names.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
+#include "project_settings.h"
 #include "scene/2d/node_2d.h"
 #include "scene/3d/spatial.h"
 #include "scene/gui/control.h"
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 585579aad57..03a862b7443 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "scene_format_text.h"
 
-#include "project_settings.h"
 #include "os/dir_access.h"
+#include "project_settings.h"
 #include "version.h"
 
 //version 2: changed names for basis, rect3, poolvectors, etc.
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 9bbbd1d091b..6c20c71af06 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -414,7 +414,7 @@ public:
 	void set_width(int p_width);
 	int get_width() const;
 
-	void ensure_default_setup(float p_min=0, float p_max=1);
+	void ensure_default_setup(float p_min = 0, float p_max = 1);
 
 	void set_curve(Ref<Curve> p_curve);
 	Ref<Curve> get_curve() const;