diff --git a/source/blender/include/BSE_headerbuttons.h b/source/blender/include/BSE_headerbuttons.h
index 50e4168ebd2..4c2e4a4c8c6 100644
--- a/source/blender/include/BSE_headerbuttons.h
+++ b/source/blender/include/BSE_headerbuttons.h
@@ -40,7 +40,6 @@ struct SpaceIpo;
 struct Ipo;
 
 /* these used to be in blender/src/headerbuttons.c: */
-#define SPACEICONMAX  16 /* See release/datafiles/blenderbuttons */
 #define XIC 20
 #define YIC 20
 
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 82588b19886..7aab508c473 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -164,31 +164,5 @@ typedef struct ScrArea {
 #define SCREEN_HANDLER_PYTHON   2
 #define SCREEN_HANDLER_VERSE	3
 
-/* dunno who thought this below is nice code, but be warned, the values are written in
-   a file, and cannot be switched or altered. enum here is out of focus (ton) */
-enum {
-	SPACE_EMPTY,
-	SPACE_VIEW3D,
-	SPACE_IPO,
-	SPACE_OOPS,
-	SPACE_BUTS,
-	SPACE_FILE,
-	SPACE_IMAGE,		
-	SPACE_INFO,
-	SPACE_SEQ,
-	SPACE_TEXT,
-	SPACE_IMASEL,
-	SPACE_SOUND,
-	SPACE_ACTION,
-	SPACE_NLA,
-	SPACE_SCRIPT,
-	SPACE_TIME,
-	SPACE_NODE
-/*	SPACE_LOGIC	*/
-};
-
-/* Adding a new space type?  Change SPACEICONMAX in BSE_headerbuttons.h */
-/* -- should rather handle this with the above enum... */
-
 #endif
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index d5f50529ca9..f89f67529a6 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -493,6 +493,7 @@ typedef struct SpaceImaSel {
 #define ST_SCROLL_SELECT        0x0001 // scrollable
 #define ST_CLEAR_NAMESPACE      0x0010 // clear namespace after script
                                        // execution (see BPY_main.c)
+
 /* SpaceOops->type */
 #define SO_OOPS			0
 #define SO_OUTLINER		1
@@ -590,4 +591,27 @@ typedef struct SpaceImaSel {
 /* sseq->flag */
 #define SEQ_DRAWFRAMES  1
 
+/* space types, moved from DNA_screen_types.h */
+enum {
+	SPACE_EMPTY,
+	SPACE_VIEW3D,
+	SPACE_IPO,
+	SPACE_OOPS,
+	SPACE_BUTS,
+	SPACE_FILE,
+	SPACE_IMAGE,		
+	SPACE_INFO,
+	SPACE_SEQ,
+	SPACE_TEXT,
+	SPACE_IMASEL,
+	SPACE_SOUND,
+	SPACE_ACTION,
+	SPACE_NLA,
+	SPACE_SCRIPT,
+	SPACE_TIME,
+	SPACE_NODE,
+	SPACEICONMAX = SPACE_NODE
+/*	SPACE_LOGIC	*/
+};
+
 #endif
diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c
index 3f2d8071c55..8b096f81840 100644
--- a/source/blender/python/api2_2x/Scene.c
+++ b/source/blender/python/api2_2x/Scene.c
@@ -37,7 +37,8 @@ struct View3D;
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "MEM_guardedalloc.h"	/* for MEM_callocN */
-#include "DNA_screen_types.h"	/* SPACE_VIEW3D, SPACE_SEQ */
+#include "DNA_space_types.h"	/* SPACE_VIEW3D, SPACE_SEQ */
+#include "DNA_screen_types.h"
 #include "DNA_userdef_types.h" /* U.userdefs */
 #include "DNA_object_types.h" /* SceneObSeq_new */
 #include "BKE_depsgraph.h"
diff --git a/source/blender/python/api2_2x/windowTheme.h b/source/blender/python/api2_2x/windowTheme.h
index 3d3fa9a37f0..761d509724d 100644
--- a/source/blender/python/api2_2x/windowTheme.h
+++ b/source/blender/python/api2_2x/windowTheme.h
@@ -35,6 +35,7 @@
 
 #include <Python.h>
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 
 typedef struct {
diff --git a/source/blender/radiosity/intern/source/raddisplay.c b/source/blender/radiosity/intern/source/raddisplay.c
index 79d40cbab7d..429e9de28a2 100644
--- a/source/blender/radiosity/intern/source/raddisplay.c
+++ b/source/blender/radiosity/intern/source/raddisplay.c
@@ -50,6 +50,7 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BKE_global.h"
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index ea769545c94..6858d2329bd 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -47,6 +47,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index 1ed58bdf61a..d481e37f905 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -58,6 +58,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"
 
diff --git a/source/blender/src/editmball.c b/source/blender/src/editmball.c
index f0f765dbe33..f92a341c2b3 100644
--- a/source/blender/src/editmball.c
+++ b/source/blender/src/editmball.c
@@ -42,6 +42,7 @@
 #include "BLI_arithb.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c
index c58a49212ba..9347d7f4793 100644
--- a/source/blender/src/editmesh_add.c
+++ b/source/blender/src/editmesh_add.c
@@ -46,6 +46,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 5c7c151192d..36575a6c5c6 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -76,6 +76,7 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_property_types.h"
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index d8b4aa0548c..2a7df196bf0 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -54,6 +54,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_space_types.h"
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 7e685465e4b..b1ec94d123b 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -55,6 +55,7 @@
 
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sound_types.h"
 #include "DNA_packedFile_types.h"
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 78130f2ea88..39aae4be851 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -55,6 +55,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"
 
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index 2103d39a753..276650a9546 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -52,6 +52,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_key_types.h" 
 
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 2152e65940c..f6bd1d76524 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -63,6 +63,7 @@
 #include "BMF_Api.h"
 
 #include "DNA_image_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
diff --git a/source/blender/src/spacetypes.c b/source/blender/src/spacetypes.c
index 3a4c09e9e1a..ea0d680e852 100644
--- a/source/blender/src/spacetypes.c
+++ b/source/blender/src/spacetypes.c
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "BIF_gl.h"
 #include "BIF_mywindow.h"
diff --git a/source/blender/src/transform_snap.c b/source/blender/src/transform_snap.c
index 53d1822ae70..9c7d7bc40ac 100644
--- a/source/blender/src/transform_snap.c
+++ b/source/blender/src/transform_snap.c
@@ -34,7 +34,7 @@
 #include <math.h>
 
 #include "DNA_object_types.h"
-#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index b3c3a45410c..508b8c48d14 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -57,6 +57,7 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"