[Bf-blender-cvs] [e6b7e9942e0] custom-manipulators: sync with 2.8

[Campbell Barton]

Commit: e6b7e9942e0d24bcec86199c50a931ef09113c54
Author: Campbell Barton
Date:   Wed Jun 7 22:27:36 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBe6b7e9942e0d24bcec86199c50a931ef09113c54

sync with 2.8

===================================================================

M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/makesrna/intern/rna_wm_api.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index c80c0169fda..f6e67d5f765 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -29,7 +29,6 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_utildefines.h"
@@ -1781,7 +1780,7 @@ static void rna_def_operator_filelist_element(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_IDPROPERTY);
 	RNA_def_property_ui_text(prop, "Name", "Name of a file or directory within a file list");
 }
-
+	
 static void rna_def_event(BlenderRNA *brna)
 {
 	StructRNA *srna;
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index 8b05e3319dd..677ea92aea1 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -41,7 +41,6 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "WM_api.h"
 #include "wm_cursors.h"
 
 #include "rna_internal.h"  /* own include */