8 files changed, 14 insertions, 23 deletions
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index 6043224df5d..88a1873c17f 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -42,7 +42,6 @@
 
 #include "BLI_iterator.h"
 #include "BKE_report.h"
-#include "DNA_object_types.h"
 
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_debug.h"
@@ -266,7 +265,7 @@ static void rna_def_depsgraph_iter(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "persistent_id", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Persistent ID",
 	                         "Persistent identifier for inter-frame matching of objects with motion blur");
-	RNA_def_property_array(prop, 2*MAX_DUPLI_RECUR);
+	RNA_def_property_array(prop, 2 * MAX_DUPLI_RECUR);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
 	RNA_def_property_int_funcs(prop, "rna_DepsgraphIter_persistent_id_get", NULL, NULL);
 
diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c
index a628dade59b..448d847a959 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.c
+++ b/source/blender/makesrna/intern/rna_lightprobe.c
@@ -37,8 +37,6 @@
 
 #ifdef RNA_RUNTIME
 
-#include "DNA_object_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_main.h"
@@ -47,7 +45,6 @@
 #include "DNA_object_types.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 static void rna_LightProbe_recalc(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index bd10bbc49ea..c31b70c57ed 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1865,13 +1865,13 @@ void RNA_def_material(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "transparent_hide_backside", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "blend_flag", MA_BL_HIDE_BACKSIDE);
-	RNA_def_property_ui_text(prop, "Hide Backside" , "Limit transparency to a single layer "
+	RNA_def_property_ui_text(prop, "Hide Backside", "Limit transparency to a single layer "
 	                                                 "(avoids transparency sorting problems)");
 	RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
 	prop = RNA_def_property(srna, "use_screen_refraction", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "blend_flag", MA_BL_SS_REFRACTION);
-	RNA_def_property_ui_text(prop, "Screen Space Refraction" , "Use raytraced screen space refractions");
+	RNA_def_property_ui_text(prop, "Screen Space Refraction", "Use raytraced screen space refractions");
 	RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
 	prop = RNA_def_property(srna, "refraction_depth", PROP_FLOAT, PROP_DISTANCE);
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 1234bd9f367..d1dcfa41e28 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -111,13 +111,13 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports,
 	}
 
 	switch (action) {
-	    case 1: /* DESELECT */
-		    base->flag &= ~BASE_SELECTED;
-		    break;
-	    case 0: /* SELECT */
-	    default:
-		    BKE_scene_layer_base_select(sl, base);
-		    break;
+		case 1: /* DESELECT */
+			base->flag &= ~BASE_SELECTED;
+			break;
+		case 0: /* SELECT */
+		default:
+			BKE_scene_layer_base_select(sl, base);
+			break;
 	}
 }
 
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 83e9d55c3df..8304fa452e4 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -401,7 +401,7 @@ static PointerRNA rna_RenderEngine_scene_layer_get(PointerRNA *ptr)
 {
 	RenderEngine *engine = (RenderEngine *)ptr->data;
 	if (engine->re != NULL) {
-		SceneLayer* scene_layer = RE_engine_get_scene_layer(engine->re);
+		SceneLayer *scene_layer = RE_engine_get_scene_layer(engine->re);
 		return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, scene_layer);
 	}
 	return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, NULL);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index c7d122280b6..59d0792eb1e 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -471,7 +471,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_node.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
-#include "BKE_idprop.h"
 #include "BKE_mesh.h"
 #include "BKE_sound.h"
 #include "BKE_screen.h"
@@ -480,9 +479,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_freestyle.h"
 #include "BKE_gpencil.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-
 #include "ED_info.h"
 #include "ED_node.h"
 #include "ED_view3d.h"
@@ -492,6 +488,7 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "ED_scene.h"
 
 #include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
 
 #ifdef WITH_FREESTYLE
@@ -2967,7 +2964,7 @@ static int rna_SceneLayer_objects_selected_skip(CollectionPropertyIterator *iter
 	Base *base = (Base *)internal->link;
 
 	if ((base->flag & BASE_SELECTED) != 0) {
-			return 0;
+		return 0;
 	}
 
 	return 1;
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c
index 3e04a0a8233..a8dcd563ed3 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -41,7 +41,6 @@
 
 #include "rna_internal.h"
 
-#include "WM_api.h"
 #include "WM_types.h"
 
 #ifdef RNA_RUNTIME
@@ -53,7 +52,6 @@
 #include <assert.h>
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 #include "DNA_workspace_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator_api.c b/source/blender/makesrna/intern/rna_wm_manipulator_api.c
index 27d292ddfa2..c948f84e087 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator_api.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator_api.c
@@ -258,7 +258,7 @@ void RNA_api_manipulator(StructRNA *srna)
 	func = RNA_def_function(srna, "target_set_operator", "rna_manipulator_target_set_operator");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	RNA_def_function_ui_description(
-	        func,"Operator to run when activating the manipulator "
+	        func, "Operator to run when activating the manipulator "
 	        "(overrides property targets)");
 	parm = RNA_def_string(func, "operator", NULL, 0, "", "Target operator");
 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);