removed some more header files, made the game engine compile with removed header files, added includes to SConstruct files.

50 files changed, 124 insertions, 2615 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 9d51fc645ba..c57daa92484 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -87,7 +87,7 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "multires.h"
+//XXX #include "multires.h"
 
 // headers for fluidsim bobj meshes
 #include <stdlib.h>
@@ -2580,18 +2580,18 @@ float *multires_render_pin(Object *ob, Mesh *me, int *orig_lvl)
 		int i;
 		
 		/* Make sure all mesh edits are properly stored in the multires data*/
-		multires_update_levels(me, 1);
+		//XXX multires_update_levels(me, 1);
 	
 		/* Copy the highest level of multires verts */
 		*orig_lvl= me->mr->current;
-		lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+		//XXX lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
 		vert_copy= MEM_callocN(sizeof(float)*3*lvl->totvert, "multires vert_copy");
 		for(i=0; i<lvl->totvert; ++i)
 			VecCopyf(&vert_copy[i*3], me->mr->verts[i].co);
 	
 		/* Goto the pin level for multires */
 		me->mr->newlvl= me->mr->pinlvl;
-		multires_set_level(ob, me, 1);
+		//XXX multires_set_level(ob, me, 1);
 	}
 	
 	return vert_copy;
@@ -2604,7 +2604,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 	if(me->mr) {
 		if((*dm)->getNumVerts(*dm) == me->totvert &&
 		   (*dm)->getNumFaces(*dm) == me->totface) {
-			MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+			//XXX MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
 			DerivedMesh *old= NULL;
 			int i;
 
@@ -2612,7 +2612,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 			(*dm)->release(*dm);
 
 			me->mr->newlvl= me->mr->renderlvl;
-			multires_set_level(ob, me, 1);
+			//XXX multires_set_level(ob, me, 1);
 			(*dm)= getMeshDerivedMesh(me, ob, NULL);
 
 			/* Some of the data in dm is referenced externally, so make a copy */
@@ -2625,16 +2625,16 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 
 			/* Restore the original verts */
 			me->mr->newlvl= BLI_countlist(&me->mr->levels);
-			multires_set_level(ob, me, 1);
-			for(i=0; i<lvl->totvert; ++i)
-				VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
+			//XXX multires_set_level(ob, me, 1);
+			//XXX for(i=0; i<lvl->totvert; ++i)
+			//XXX 	VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
 		}
 		
 		if(vert_copy)
 			MEM_freeN(vert_copy);
 			
 		me->mr->newlvl= orig_lvl;
-		multires_set_level(ob, me, 1);
+		//XXX multires_set_level(ob, me, 1);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 129e9cd3f4f..32b07fbc111 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -66,7 +66,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 /* *********************** NOTE ON POSE AND ACTION **********************
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index dc5ea96b58a..491964e7359 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include "MEM_guardedalloc.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 69cd82fced7..416402eb640 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 #include "MEM_guardedalloc.h"
-#include "nla.h"
+//XXX #include "nla.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index f649dc9690f..1b5df77c062 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -2107,6 +2107,6 @@ void build_particle_system(Object *ob)
 
 	disable_speed_curve(0);
 	
-	if(waitcursor_set) waitcursor(0);
+	//XXX if(waitcursor_set) waitcursor(0);
 }
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 5976f7846f2..b16c03b7d92 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -114,7 +114,7 @@
 #include "BKE_idprop.h"
 #include "BKE_particle.h"
 
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
 
 #define MAX_IDPUP		60	/* was 24 */
 
@@ -347,7 +347,7 @@ static ID *alloc_libblock_notest(short type)
 			id= MEM_callocN(sizeof(Text), "text");
 			break;
 		case ID_SCRIPT:
-			id= MEM_callocN(sizeof(Script), "script");
+			//XXX id= MEM_callocN(sizeof(Script), "script");
 			break;
 		case ID_SO:
 			id= MEM_callocN(sizeof(bSound), "sound");
@@ -504,7 +504,7 @@ void free_libblock(ListBase *lb, void *idv)
 			free_text((Text *)id);
 			break;
 		case ID_SCRIPT:
-			free_script((Script *)id);
+			//XXX free_script((Script *)id);
 			break;
 		case ID_SO:
 			sound_free_sound((bSound *)id);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 811b6d39f47..9b9e94774bc 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -93,7 +93,7 @@
 #include "BKE_utildefines.h"
 #include "depsgraph_private.h"
 
-#include "LOD_DependKludge.h"
+//XXX #include "LOD_DependKludge.h"
 #include "LOD_decimation.h"
 
 #include "CCGSubSurf.h"
@@ -3318,6 +3318,8 @@ static void decimateModifier_copyData(ModifierData *md, ModifierData *target)
 	tdmd->percent = dmd->percent;
 }
 
+//XXX
+#if 0 
 static DerivedMesh *decimateModifier_applyModifier(
                  ModifierData *md, Object *ob, DerivedMesh *derivedData,
                  int useRenderParams, int isFinalCalc)
@@ -3436,6 +3438,7 @@ static DerivedMesh *decimateModifier_applyModifier(
 exit:
 	return result;
 }
+#endif
 
 /* Smooth */
 
@@ -6385,7 +6388,7 @@ static void meshdeformModifier_do(
 
 	/* bind weights if needed */
 	if(!mmd->bindcos)
-		harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
+		//XXX harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
 
 	/* verify we have compatible weights */
 	totvert= numVerts;
@@ -6677,7 +6680,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->flags = eModifierTypeFlag_AcceptsMesh;
 		mti->initData = decimateModifier_initData;
 		mti->copyData = decimateModifier_copyData;
-		mti->applyModifier = decimateModifier_applyModifier;
+		//XXX mti->applyModifier = decimateModifier_applyModifier;
 
 		mti = INIT_TYPE(Smooth);
 		mti->type = eModifierTypeType_OnlyDeform;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index b57a5f465c0..a3c1d9ef19d 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -44,7 +44,7 @@
 #include "BKE_global.h"
 #include "BKE_multires.h"
 
-#include "editmesh.h"
+//XXX #include "editmesh.h"
 
 #include <math.h>
 
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index fce43aba6bc..4e0897589d2 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -53,7 +53,7 @@
 #include "BKE_blender.h"
 #include "BKE_sca.h"
 
-#include "mydevice.h"
+//#include "wm_event_types.h"
 
 void free_text_controllers(Text *txt)
 {
@@ -155,7 +155,7 @@ void init_sensor(bSensor *sens)
 		break;
 	case SENS_MOUSE:
 		ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
-		ms->type= LEFTMOUSE;
+		//XXX ms->type= LEFTMOUSE;
 		break;
 	case SENS_COLLISION:
 		sens->data= MEM_callocN(sizeof(bCollisionSensor), "colsens");
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b19e2f4f0be..aae3b9f140f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -86,7 +86,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 #ifdef WIN32
 #else
diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c
index fda5cf89298..deb9229c63e 100644
--- a/source/blender/blenkernel/intern/script.c
+++ b/source/blender/blenkernel/intern/script.c
@@ -35,7 +35,7 @@
  */
 
 #include "BKE_script.h"
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -51,6 +51,9 @@
 /* XXX this function and so also the file should not be needed anymore,
  * since we have to force clearing all Python related data before freeing
  * Blender's library. Still testing, will decide later (Willian). */
+
+//XXX 
+#if 0
 void free_script (Script *script)
 {
 	if (!script) return;
@@ -63,3 +66,4 @@ void free_script (Script *script)
 
 	return;
 }
+#endif
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 0e5c63392ba..45871115641 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -477,7 +477,7 @@ VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf)
 	//init Freetype	
 	err = FT_Init_FreeType( &library);
 	if(err) {
-		error("Failed to load the Freetype font library");
+		//XXX error("Failed to load the Freetype font library");
 		return 0;
 	}
 
@@ -502,7 +502,7 @@ int BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character)
 	// Init Freetype
 	err = FT_Init_FreeType(&library);
 	if(err) {
-		error("Failed to load the Freetype font library");
+		//XXX error("Failed to load the Freetype font library");
 		return 0;
 	}
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1ad59c7a369..a3d29ce012c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -51,7 +51,7 @@
     #include <io.h> // for open close read
 #endif
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
@@ -143,13 +143,13 @@
 #include "BLO_undofile.h"
 #include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory
 
-#include "multires.h"
+//XXX #include "multires.h"
 
 #include "readfile.h"
 
 #include "genfile.h"
 
-#include "mydevice.h"
+//XXX #include "wm_event_types.h"
 
 #include <errno.h>
 
@@ -4319,18 +4319,18 @@ static void vcol_to_fcol(Mesh *me)
 static int map_223_keybd_code_to_224_keybd_code(int code)
 {
 	switch (code) {
-	case 312:	return F12KEY;
-	case 159:	return PADSLASHKEY;
-	case 161:	return PAD0;
-	case 154:	return PAD1;
-	case 150:	return PAD2;
-	case 155:	return PAD3;
-	case 151:	return PAD4;
-	case 156:	return PAD5;
-	case 152:	return PAD6;
-	case 157:	return PAD7;
-	case 153:	return PAD8;
-	case 158:	return PAD9;
+//XXX	case 312:	return F12KEY;
+//XXX		case 159:	return PADSLASHKEY;
+//XXX		case 161:	return PAD0;
+//XXX		case 154:	return PAD1;
+//XXX		case 150:	return PAD2;
+//XXX		case 155:	return PAD3;
+//XXX		case 151:	return PAD4;
+//XXX		case 156:	return PAD5;
+//XXX		case 152:	return PAD6;
+//XXX		case 157:	return PAD7;
+//XXX		case 153:	return PAD8;
+//XXX		case 158:	return PAD9;
 	default: return code;
 	}
 }
diff --git a/source/blender/editors/include/BPI_script.h b/source/blender/editors/include/BPI_script.h
deleted file mode 100644
index 9fef7ae74a8..00000000000
--- a/source/blender/editors/include/BPI_script.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * include/BPI_script.h (jan-2004 ianwill)
- *	
- * $Id: BPI_script.h 4590 2005-06-11 05:30:14Z ianwill $
- *
- * Header for BPython's script structure. BPI: Blender Python external include
- * file.
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Willian P. Germano.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef BPI_SCRIPT_H
-#define BPI_SCRIPT_H
-
-//#include "DNA_listBase.h"
-#include "DNA_ID.h"
-
-typedef struct Script {
-	ID id;
-
-	void *py_draw;
-	void *py_event;
-	void *py_button;
-	void *py_browsercallback;
-	void *py_globaldict;
-
-	int flags, lastspace;
-
-} Script;
-
-/* Note: a script that registers callbacks in the script->py_* pointers
- * above (or calls the file or image selectors) needs to keep its global
- * dictionary until Draw.Exit() is called and the callbacks removed.
- * Unsetting SCRIPT_RUNNING means the interpreter reached the end of the
- * script and returned control to Blender, but we can't get rid of its
- * namespace (global dictionary) while SCRIPT_GUI or SCRIPT_FILESEL is set,
- * because of the callbacks.  The flags and the script name are saved in
- * each running script's global dictionary, under '__script__'. */
-
-/* Flags */
-#define SCRIPT_RUNNING	0x01
-#define SCRIPT_GUI			0x02
-#define SCRIPT_FILESEL	0x04
-
-#endif /* BPI_SCRIPT_H */
diff --git a/source/blender/editors/include/LOD_DependKludge.h b/source/blender/editors/include/LOD_DependKludge.h
deleted file mode 100644
index b844552f32a..00000000000
--- a/source/blender/editors/include/LOD_DependKludge.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * $Id: LOD_DependKludge.h 229 2002-12-27 13:11:01Z mein $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- * Decimation file dependency fix (and kludge)
- * Use together with a NAN_DECIMATIONTEST env.var. for Makefile-based linking
- */
-#ifndef LOD_DEPENDKLUDGE_H
-#define LOD_DEPENDKLUDGE_H
-
-#define NAN_DECIMATION
-
-#endif //LOD_DEPENDKLUDGE_H
-
diff --git a/source/blender/editors/include/butspace.h b/source/blender/editors/include/butspace.h
deleted file mode 100644
index e48ca941a13..00000000000
--- a/source/blender/editors/include/butspace.h
+++ /dev/null
@@ -1,762 +0,0 @@
-/**
- * $Id: butspace.h 12708 2007-11-28 18:43:09Z ton $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-#ifndef BUTSPACE_H
-#define BUTSPACE_H
-
-/* all internal calls and event codes for buttons space */
-
-struct Base;
-struct Object;
-struct ID;
-struct ColorBand;
-struct uiBlock;
-struct rctf;
-struct CurveMap;
-struct ImageUser;
-struct RenderResult;
-struct Image;
-
-/* buts->scaflag */		
-#define BUTS_SENS_SEL		1
-#define BUTS_SENS_ACT		2
-#define BUTS_SENS_LINK		4
-#define BUTS_CONT_SEL		8
-#define BUTS_CONT_ACT		16
-#define BUTS_CONT_LINK		32
-#define BUTS_ACT_SEL		64
-#define BUTS_ACT_ACT		128
-#define BUTS_ACT_LINK		256
-
-/* internal */
-
-/* scene */
-extern void render_panels(void);
-extern void do_render_panels(unsigned short event);
-extern void anim_panels(void);
-extern void sound_panels(void);
-extern void do_soundbuts(unsigned short event);
-
-/* object */
-extern void object_panels(void);
-extern void physics_panels(void);
-extern void particle_panels(void);
-extern void do_object_panels(unsigned short event);
-extern void do_constraintbuts(unsigned short event);
-extern void object_panel_constraint(char *context);
-extern void autocomplete_bone(char *str, void *arg_v);
-extern void autocomplete_vgroup(char *str, void *arg_v);
-
-/* effects */
-extern void effects_panels(void);
-extern void do_effects_panels(unsigned short event);
-
-/* modifiers */
-extern int mod_moveUp(void *ob_v, void *md_v);
-extern int mod_moveDown(void *ob_v, void *md_v);
-
-/* constraint */
-extern void const_moveUp(void *ob_v, void *con_v);
-extern void const_moveDown(void *ob_v, void *con_v);
-extern void del_constr_func (void *ob_v, void *con_v);
-
-/* editing */
-extern void editing_panels(void);
-extern void do_common_editbuts(unsigned short event);
-extern void do_meshbuts(unsigned short event);
-extern void do_vgroupbuts(unsigned short event);
-extern void do_curvebuts(unsigned short event);
-extern void do_fontbuts(unsigned short event);
-extern void do_mballbuts(unsigned short event);
-extern void do_latticebuts(unsigned short event);
-extern void do_fpaintbuts(unsigned short event);
-extern void do_cambuts(unsigned short event);
-extern void do_armbuts(unsigned short event);
-extern void do_uvcalculationbuts(unsigned short event);
-extern void weight_paint_buttons(struct uiBlock *);
-extern void particle_edit_buttons(struct uiBlock *);
-
-extern char *get_vertexgroup_menustr(struct Object *ob);	// used in object buttons
-
-/* shading */
-extern void draw_colorband_buts_small(struct uiBlock *block, struct ColorBand *coba, rctf *rct, int event);
-extern void material_panels(void);
-extern void do_matbuts(unsigned short event);
-extern void lamp_panels(void);
-extern void do_lampbuts(unsigned short event);
-extern void world_panels(void);
-extern void do_worldbuts(unsigned short event);
-extern void radio_panels(void);
-extern void do_radiobuts(unsigned short event);
-extern void texture_panels(void);
-extern void do_texbuts(unsigned short event);
-void uiblock_image_panel(struct uiBlock *block, struct Image **ima_pp, struct ImageUser *iuser, 
-						 short redraw, short imagechanged);
-void uiblock_layer_pass_buttons(struct uiBlock *block, struct RenderResult *rr, 
-							   struct ImageUser *iuser, int event, int x, int y, int w);
-
-/* logic */
-extern void do_logic_buts(unsigned short event);
-extern void logic_buts(void);
-
-/* script */
-extern void script_panels(void);
-extern void do_scriptbuts(unsigned short event);
-
-/* ipowindow */
-extern void do_ipobuts(unsigned short event);	// drawipo.c (bad! ton)
-
-/* butspace.c */
-void test_meshpoin_but(char *name, struct ID **idpp);
-void test_obpoin_but(char *name, struct ID **idpp);
-void test_meshobpoin_but(char *name, struct ID **idpp);
-void test_scenepoin_but(char *name, struct ID **idpp);
-void test_matpoin_but(char *name, struct ID **idpp);
-void test_scriptpoin_but(char *name, struct ID **idpp);
-void test_actionpoin_but(char *name, ID **idpp);
-void test_grouppoin_but(char *name, ID **idpp);
-void test_texpoin_but(char *name, ID **idpp);
-void test_imapoin_but(char *name, ID **idpp);
-
-void test_idbutton_cb(void *namev, void *arg2_unused);
-
-struct CurveMapping;
-void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char labeltype, short event, short redraw, struct rctf *rect);
-
-/* -------------- internal event defines ------------ */
-
-
-#define B_DIFF			1	
-
-/* *********************** */
-#define B_VIEWBUTS		1100
-
-#define B_OBJECTPANELROT 	1007
-#define B_OBJECTPANELMEDIAN 1008
-#define B_ARMATUREPANEL1 	1009
-#define B_ARMATUREPANEL2 	1010
-#define B_OBJECTPANELPARENT 1011
-#define B_OBJECTPANEL		1012
-#define B_ARMATUREPANEL3 	1013
-#define B_OBJECTPANELSCALE 	1014
-#define B_OBJECTPANELDIMS 	1015
-
-/* *********************** */
-#define B_LAMPBUTS		1200
-
-#define B_LAMPREDRAW		1101
-#define B_COLLAMP		1102
-#define B_TEXCLEARLAMP		1103
-#define B_SBUFF			1104
-#define B_SHADBUF		1105
-#define B_SHADRAY		1106
-#define B_LMTEXPASTE	1107
-#define B_LMTEXCOPY		1108
-#define B_LFALLOFFCHANGED	1109
-
-/* *********************** */
-#define B_MATBUTS		1300
-
-#define B_MATCOL		1201
-#define B_SPECCOL		1202
-#define B_MIRCOL		1203
-#define B_ACTCOL		1204
-#define B_MATFROM		1205
-#define B_MATPRV		1206
-#define B_LAMPPRV		1207
-#define B_WORLDPRV		1208
-#define B_MTEXCOL		1210
-#define B_TEXCLEAR		1211
-#define B_MTEXPASTE		1212
-#define B_MTEXCOPY		1213
-#define B_MATLAY		1214
-#define B_MATHALO		1215
-#define B_MATZTRANSP	1216
-#define B_MATRAYTRANSP	1217
-#define B_MATCOLORBAND	1218
-		/* yafray: material preset menu event */
-#define B_MAT_YF_PRESET	1219
-
-#define B_MAT_LAYERBROWSE	1220
-#define B_MAT_USENODES		1221
-#define B_MAT_VCOL_PAINT	1222
-#define B_MAT_VCOL_LIGHT	1223
-
-	/* world buttons: buttons-preview update, and redraw 3dview */
-#define B_WORLDPRV2		1224
-
-#define B_MAT_PARTICLE		1225
-
-/* *********************** */
-#define B_TEXBUTS		1400
-
-#define B_TEXTYPE		1301
-#define B_DEFTEXVAR		1302
-
-#define B_NAMEIMA		1304
-#define B_TEXCHANNEL	1305
-#define B_TEXREDR_PRV	1306
-#define B_IMAGECHANGED	1307
-
-#define B_LOADPLUGIN	1310
-#define B_NAMEPLUGIN	1311
-#define B_COLORBAND		1312
-#define B_ADDCOLORBAND	1313
-#define B_DELCOLORBAND	1314
-#define B_CALCCBAND		1315
-#define B_CALCCBAND2	1316
-#define B_DOCOLORBAND	1317
-#define B_REDRAWCBAND	1318
-#define B_BANDCOL		1319
-#define B_LOADTEXIMA1	1320
-#define B_TEXPRV		1321
-
-
-#define B_PLUGBUT		1325
-/* B_PLUGBUT reserves 24 buttons at least! */
-
-#define B_ENV_MAKE		1350
-#define B_ENV_FREE		1351
-#define B_ENV_DELETE	1352
-#define B_ENV_SAVE		1353
-#define B_ENV_OB		1354
-
-#define B_ENV_FREE_ALL	1357
-
-
-/* **************** animbuts = object buttons ******* */
-#define B_ANIMBUTS		1500
-
-#define B_RECALCPATH	1401
-#define B_TRACKBUTS		1402
-#define B_DUPLI_FRAME	1403
-#define B_DUPLI_VERTS	1404
-#define B_DUPLI_FACES	1405
-#define B_DUPLI_GROUP	1406
-
-
-#define B_PRINTSPEED	1413
-#define B_PRINTLEN		1414
-#define B_RELKEY		1415
-#define B_CURVECHECK	1416
-
-#define B_SOFTBODY_CHANGE		1420
-#define B_SOFTBODY_DEL_VG		1421
-#define B_SOFTBODY_BAKE			1422
-#define B_SOFTBODY_BAKE_FREE	1423
-
-/* this has MAX_EFFECT settings! Next free define is 1450... */
-#define B_SELEFFECT	1430
-
-/* Fluidsim button defines */
-#define B_FLUIDSIM_BAKE	        1450
-#define B_FLUIDSIM_SELDIR	      1451
-#define B_FLUIDSIM_FORCEREDRAW	1452
-#define B_FLUIDSIM_MAKEPART	    1453
-
-#define B_GROUP_RELINK			1460
-#define B_OBJECT_IPOFLAG		1461
-
-#define B_BAKEABLE_CHANGE		1470
-
-/* *********************** */
-#define B_WORLDBUTS		1600
-
-#define B_TEXCLEARWORLD	1501
-#define B_COLHOR		1502
-#define B_COLZEN		1503
-#define B_WMTEXPASTE	1504
-#define B_WMTEXCOPY		1505
-#define B_AO_FALLOFF	1506
-
-/* *********************** */
-#define B_RENDERBUTS	1700
-
-#define B_FS_PIC		1601
-#define B_FS_BACKBUF	1602
-
-#define B_FS_FTYPE		1604
-#define B_DORENDER		1605
-#define B_DOANIM		1606
-#define B_PLAYANIM		1607
-#define B_PR_PAL		1608
-#define B_PR_FULL		1609
-#define B_PR_PRV		1610
-#define B_PR_HD			1611
-#define B_PR_PAL169		1612
-
-#define B_REDRAWDISP	1615
-#define B_SETBROWSE		1616
-#define B_CLEARSET		1617
-#define B_PR_PRESET		1618
-#define B_PR_PANO		1619
-#define B_PR_NTSC		1620
-
-#define B_IS_FTYPE		1622
-#define B_IS_BACKBUF		1623
-#define B_PR_PC			1624
-
-#define B_PR_PANO360    	1627
-#define B_PR_HALFFIELDS		1628
-#define B_NEWRENDERPIPE 	1629
-#define B_R_SCALE       	1630
-#define B_G_SCALE       	1631
-#define B_B_SCALE       	1632
-#define B_USE_R_SCALE   	1633
-#define B_USE_G_SCALE   	1634
-#define B_USE_B_SCALE   	1635
-#define B_EDGECOLSLI    	1636
-#define B_GAMMASLI      	1637
-
-#define B_FILETYPEMENU  	1638
-#define B_SELECTCODEC   	1639
-#define B_RTCHANGED		1640
-#define B_SWITCHRENDER		1641
-#define B_FBUF_REDO		1642
-
-#define B_SET_EDGE			1643
-#define B_SET_ZBLUR			1644
-#define B_ADD_RENDERLAYER	1645
-#define B_SET_PASS			1646
-
-/* *********************** */
-#define B_ARMATUREBUTS		1800
-#define	B_POSE			1701
-
-/* *********************** */
-#define B_COMMONEDITBUTS	2049
-
-#define B_CHANGEDEP		2002
-#define B_MATWICH		2003
-#define B_MATNEW		2004
-#define B_MATDEL		2005
-#define B_MATASS		2006
-#define B_MATSEL		2007
-#define B_MATDESEL		2008
-#define B_HIDE			2009
-#define B_REVEAL		2010
-#define B_SELSWAP		2011
-#define B_SETSMOOTH		2012
-#define B_SETSOLID		2013
-#define B_AUTOTEX		2014
-#define B_DOCENTER		2015
-#define B_DOCENTERNEW		2016
-#define B_DOCENTERCURSOR	2017
-#define B_MATASS_BROWSE	2018
-
-	/* 20 values! */
-#define B_OBLAY			2019
-
-#define B_ADDKEY		2041
-#define B_SETKEY		2042
-#define B_DELKEY		2043
-#define B_NAMEKEY		2044
-#define B_PREVKEY		2045
-#define B_NEXTKEY		2046
-#define B_LOCKKEY		2047
-#define B_MATCOL2		2048
-
-#define B_MESHBUTS		2090
-
-#define B_FLIPNORM		2050
-#define B_SPIN			2051
-#define B_SPINDUP		2052
-#define B_EXTR			2053
-#define B_SCREW			2054
-#define B_EXTREP		2055
-#define B_SPLIT			2056
-#define B_REMDOUB		2057
-#define B_SUBDIV		2058
-#define B_FRACSUBDIV	2059
-#define B_XSORT			2060
-#define B_HASH			2061
-#define B_MAKESTICKY	2062
-#define B_DELSTICKY		2063
-#define B_NEWMCOL		2064
-#define B_DELMCOL		2065
-#define B_TOSPHERE			2066
-#define B_DECIM_FACES		2067
-#define B_DECIM_CANCEL		2068
-#define B_DECIM_APPLY		2069
-/* B_SLOWERDRAW and B_FASTERDRAW removed */
-#define B_VERTEXNOISE		2072
-#define B_VERTEXSMOOTH		2073
-#define B_NEWTFACE			2074
-#define B_DELTFACE			2075
-#define B_CHROMADEPTH		2076
-#define B_DRAWEDGES			2077
-#define B_DRAWCREASES		2078
-#define B_SETTFACE			2079
-#define B_SETMCOL			2080
-#define B_JOINTRIA			2081
-#define B_SETTFACE_RND		2082
-#define B_SETMCOL_RND		2083
-
-/* *********************** */
-#define B_VGROUPBUTS		2100
-
-#define B_NEWVGROUP			2091
-#define B_DELVGROUP			2092
-#define B_ASSIGNVGROUP		2093
-#define B_REMOVEVGROUP		2094
-#define B_SELVGROUP			2095	
-#define B_DESELVGROUP		2096
-#define B_AUTOVGROUP		2097
-#define B_LINKEDVGROUP		2098
-#define B_COPYVGROUP 2099
-
-
-
-/* *********************** */
-#define B_CURVEBUTS		2200
-
-#define B_CONVERTPOLY		2101
-#define B_CONVERTBEZ		2102
-#define B_CONVERTBSPL		2103
-#define B_CONVERTCARD		2104
-#define B_CONVERTNURB		2105
-#define B_UNIFU			2106
-#define B_ENDPU			2107
-#define B_BEZU			2108
-#define B_UNIFV			2109
-#define B_ENDPV			2110
-#define B_BEZV			2111
-#define B_SETWEIGHT		2112
-#define B_SETW1			2113
-#define B_SETW2			2114
-#define B_SETW3			2115
-#define B_SETORDER		2116
-#define B_MAKEDISP		2117
-#define B_SUBDIVCURVE		2118
-#define B_SPINNURB		2119
-#define B_CU3D			2120
-#define B_SETRESOLU		2121
-#define B_SETW4			2122
-#define B_SUBSURFTYPE		2123
-#define B_TILTINTERP		2124
-#define B_SETPT_AUTO	2125
-#define B_SETPT_VECTOR	2126
-#define B_SETPT_ALIGN	2127
-#define B_SETPT_FREE	2128
-
-/* *********************** */
-#define B_FONTBUTS		2300
-
-#define B_MAKEFONT		2201
-#define B_TOUPPER		2202
-#define B_SETFONT		2203
-#define B_LOADFONT		2204
-#define B_TEXTONCURVE		2205
-#define B_PACKFONT		2206
-#define B_LOAD3DTEXT		2207
-#define B_LOREM			2208
-#define B_FASTFONT		2209
-#define B_INSTB			2210
-#define B_DELTB			2211
-#define B_STYLETOSELB		2212
-#define B_STYLETOSELU		2213
-#define B_STYLETOSELI		2214
-
-#define B_SETCHAR		2215
-#define B_SETUPCHAR		2216
-#define B_SETDOWNCHAR		2217
-#define B_SETCAT		2218
-#define B_SETUNITEXT		2219
-
-/* *********************** */
-#define B_ARMBUTS		2400
-
-#define B_ARM_RECALCDATA	2301
-#define B_ARM_STRIDE		2302
-#define B_ARM_CALCPATHS		2303
-#define B_ARM_CLEARPATHS	2304
-
-/* *********************** */
-#define B_CAMBUTS		2500
-
-/* *********************** */
-#define B_MBALLBUTS		2600
-
-#define B_RECALCMBALL		2501
-
-/* *********************** */
-#define B_LATTBUTS		2700
-
-#define B_RESIZELAT		2601
-#define B_DRAWLAT		2602
-#define B_LATTCHANGED		2603
-#define B_REGULARLAT		2604
-
-/* *********************** */
-#define B_GAMEBUTS		2800
-
-#define B_ADD_PROP		2701
-#define B_CHANGE_PROP		2702
-
-#define B_ADD_SENS		2703
-#define B_CHANGE_SENS		2704
-#define B_DEL_SENS		2705
-
-#define B_ADD_CONT		2706
-#define B_CHANGE_CONT		2707
-#define B_DEL_CONT		2708
-
-#define B_ADD_ACT		2709
-#define B_CHANGE_ACT		2710
-#define B_DEL_ACT		2711
-
-#define B_SOUNDACT_BROWSE	2712
-
-#define B_SETSECTOR		2713
-#define B_SETPROP		2714
-#define B_SETACTOR		2715
-#define B_SETMAINACTOR		2716
-#define B_SETDYNA		2717
-
-/* *********************** */
-#define B_FPAINTBUTS		2900
-
-#define B_VPCOLSLI		2801
-#define B_VPGAMMA		2802
-
-#define B_COPY_TF_MODE		2804
-#define B_COPY_TF_UV		2805
-#define B_COPY_TF_COL		2806
-#define B_REDR_3D_IMA		2807
-#define B_SET_VCOL		2808
-
-#define B_COPY_TF_TEX		2814
-#define B_TFACE_HALO		2815
-#define B_TFACE_BILLB		2816
-
-#define B_SHOWTEX		2832
-#define B_ASSIGNMESH		2833
-
-#define B_WEIGHT0_0		2840
-#define B_WEIGHT1_4		2841
-#define B_WEIGHT1_2		2842
-#define B_WEIGHT3_4		2843
-#define B_WEIGHT1_0		2844
-
-#define B_OPA1_8		2845
-#define B_OPA1_4		2846
-#define B_OPA1_2		2847
-#define B_OPA3_4		2848
-#define B_OPA1_0		2849
-
-#define B_CLR_WPAINT		2850
-
-#define B_BRUSHBROWSE	2851
-#define B_BRUSHDELETE	2852
-#define B_BRUSHLOCAL	2853
-#define B_BRUSHCHANGE	2854
-#define B_BTEXBROWSE	2855
-#define B_BTEXDELETE	2856
-#define B_BRUSHKEEPDATA 2857
-
-/* Sculptmode */
-#define B_SCULPT_TEXBROWSE      2860
-
-/* Particles */
-#define B_BAKE_OLENGTH		2870
-#define B_BAKE_APPLY_AV		2871
-#define B_BAKE_KEYTIME		2872
-#define B_BAKE_AV_CHANGE	2873
-#define B_BAKE_REDRAWEDIT	2874
-#define B_BAKE_RECACHE		2875
-
-/* *********************** */
-#define B_RADIOBUTS		3000
-
-#define B_RAD_GO		2901
-#define B_RAD_INIT		2902
-#define B_RAD_LIMITS		2903
-#define B_RAD_FAC		2904
-#define B_RAD_NODELIM		2905
-#define B_RAD_NODEFILT		2906
-#define B_RAD_FACEFILT		2907
-#define B_RAD_ADD		2908
-#define B_RAD_DELETE		2909
-#define B_RAD_COLLECT		2910
-#define B_RAD_SHOOTP		2911
-#define B_RAD_SHOOTE		2912
-#define B_RAD_REPLACE		2913
-#define B_RAD_DRAW		2914
-#define B_RAD_FREE		2915
-#define B_RAD_ADDMESH		2916
-
-/* *********************** */
-#define B_SCRIPTBUTS		3100
-
-#define B_SCRIPT_ADD		3001
-#define B_SCRIPT_DEL		3002
-#define B_SCRIPT_TYPE		3003
-
-/* Scene script buttons */
-#define B_SSCRIPT_ADD		3004
-#define B_SSCRIPT_DEL		3005
-#define B_SSCRIPT_TYPE		3006
-
-/* *********************** */
-#define B_SOUNDBUTS		3200
-enum B_SOUND_BUTTONS {
-	B_SOUND_CHANGED = 3101,
-		B_SOUND_REDRAW,
-		B_SOUND_VOLUME,
-		B_SOUND_PANNING,
-		B_SOUND_PITCH,
-		B_SOUND_LOAD_SAMPLE,
-		B_SOUND_MENU_SAMPLE,
-		B_SOUND_NAME_SAMPLE,
-		B_SOUND_UNLINK_SAMPLE,
-		B_SOUND_RELOAD_SAMPLE,
-		B_SOUND_UNPACK_SAMPLE,
-		B_SOUND_PLAY_SAMPLE,
-		B_SOUND_COPY_SOUND,
-		B_SOUND_LOOPSTART,
-		B_SOUND_LOOPEND,
-		B_SOUND_BIDIRECTIONAL,
-		B_SOUND_RECALC,
-		B_SOUND_RATECHANGED,
-		B_SOUND_MIXDOWN
-};
-
-/* *********************** */
-#define B_CONSTRAINTBUTS	3300
-enum {
-	B_CONSTRAINT_TEST = 3201,
-	B_CONSTRAINT_CHANGETARGET,
-	B_CONSTRAINT_ADD_NULL,
-	B_CONSTRAINT_ADD_KINEMATIC,
-	B_CONSTRAINT_ADD_TRACKTO,
-	B_CONSTRAINT_ADD_MINMAX,
-	B_CONSTRAINT_ADD_ROTLIKE,
-	B_CONSTRAINT_ADD_LOCLIKE,
-	B_CONSTRAINT_ADD_SIZELIKE,
-	B_CONSTRAINT_ADD_ACTION,
-	B_CONSTRAINT_ADD_LOCKTRACK,
-	B_CONSTRAINT_ADD_FOLLOWPATH,
-	B_CONSTRAINT_ADD_DISTANCELIMIT,
-	B_CONSTRAINT_ADD_STRETCHTO,
-	B_CONSTRAINT_ADD_LOCLIMIT,
-	B_CONSTRAINT_ADD_ROTLIMIT,
-	B_CONSTRAINT_ADD_SIZELIMIT,
-	B_CONSTRAINT_ADD_RIGIDBODYJOINT,
-	B_CONSTRAINT_ADD_CHILDOF,
-	B_CONSTRAINT_ADD_PYTHON,
-	B_CONSTRAINT_ADD_CLAMPTO,
-	B_CONSTRAINT_ADD_TRANSFORM,
-	B_CONSTRAINT_INF
-};
-
-/* *********************** */
-#define B_UVAUTOCALCBUTS	3400
-enum {
-	B_UVAUTO_REDRAW = 3301,
-	B_UVAUTO_SPHERE,
-	B_UVAUTO_CYLINDER,
-	B_UVAUTO_CYLRADIUS,
-	B_UVAUTO_WINDOW,
-	B_UVAUTO_CUBE,
-	B_UVAUTO_CUBESIZE,
-	B_UVAUTO_RESET,
-	B_UVAUTO_BOUNDS,
-	B_UVAUTO_TOP,
-	B_UVAUTO_FACE,
-	B_UVAUTO_OBJECT,
-	B_UVAUTO_ALIGNX,
-	B_UVAUTO_ALIGNY,
-	B_UVAUTO_UNWRAP,
-	B_UVAUTO_DRAWFACES
-};
-
-#define B_EFFECTSBUTS		3500
-
-#define B_AUTOTIMEOFS		3403
-#define B_FRAMEMAP		3404
-#define B_NEWEFFECT		3405
-#define B_PREVEFFECT		3406
-#define B_NEXTEFFECT		3407
-#define B_CHANGEEFFECT		3408
-#define B_CALCEFFECT		3409
-#define B_DELEFFECT		3410
-#define B_RECALCAL		3411
-#define B_RECALC_DEFL		3412
-#define B_EFFECT_DEP		3413
-#define B_FIELD_DEP		3414
-#define B_FIELD_CHANGE		3415
-#define B_PAF_SET_VG		3416
-#define B_PAF_SET_VG1		3417
-#define	B_PARTBROWSE		3418
-#define B_PARTDELETE		3419
-#define B_PARTALONE			3420
-#define B_PARTLOCAL			3421
-#define B_PARTAUTONAME		3422
-#define B_PART_ALLOC		3423
-#define B_PART_DISTR		3424
-#define B_PART_INIT			3425
-#define B_PART_RECALC		3426
-#define B_PART_REDRAW		3427
-#define B_PARTTYPE			3428
-#define B_PARTACT			3429
-#define B_PARTTARGET		3430
-#define B_PART_ALLOC_CHILD	3431
-#define B_PART_DISTR_CHILD	3432
-#define B_PART_INIT_CHILD	3433
-#define B_PART_RECALC_CHILD	3434
-#define B_PART_EDITABLE		3435
-
-#define B_PART_REKEY		3436
-
-#define B_MODIFIER_BUTS		3600
-
-#define B_MODIFIER_RECALC	3501
-#define B_MODIFIER_REDRAW	3502
-
-/* *********************** */
-#define B_NODE_BUTS			4000
-		/* 400 slots reserved, we want an exec event for each node */
-#define B_NODE_LOADIMAGE	3601
-#define B_NODE_TREE_EXEC	3602
-
-		/* exec should be last in this list */
-#define B_NODE_EXEC			3610
-
-
-/* *********************** */
-/*  BUTTON 4001-4032: layers? (sort this out!) */
-
-/* *********************** */
-/* event code 0x4000 (16384) and larger: general events (redraws, etc) */
-
-
-#endif
-
diff --git a/source/blender/editors/include/datatoc.h b/source/blender/editors/include/datatoc.h
deleted file mode 100644
index 250418f8a9d..00000000000
--- a/source/blender/editors/include/datatoc.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * datatoc.h
- *
- * $Id: datatoc.h 11920 2007-09-02 17:25:03Z elubie $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef DATATOC_H
-#define DATATOC_H 
-
-extern int datatoc_B_blend_size;
-extern char datatoc_B_blend[];
-
-extern int datatoc_Bfs_size;
-extern char datatoc_Bfs[];
-
-extern int datatoc_blenderbuttons_size;
-extern char datatoc_blenderbuttons[];
-
-extern int datatoc_prvicons_size;
-extern char datatoc_prvicons[];
-
-extern int datatoc_Bfont_size;
-extern char datatoc_Bfont[];
-
-extern int datatoc_bfont_ttf_size;
-extern char datatoc_bfont_ttf[];
-
-extern int datatoc_cmap_tga_size;
-extern char datatoc_cmap_tga[];
-
-extern int datatoc_cmovie_tga_size;
-extern char datatoc_cmovie_tga[];
-
-#endif /* DATATOC_H */
-
diff --git a/source/blender/editors/include/editlattice_ext.h b/source/blender/editors/include/editlattice_ext.h
deleted file mode 100644
index b0cb186a587..00000000000
--- a/source/blender/editors/include/editlattice_ext.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * editlattice_ext.h
- *
- * $Id: editlattice_ext.h 229 2002-12-27 13:11:01Z mein $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef EDITLATTICE_EXT_H
-#define EDITLATTICE_EXT_H "$Id: editlattice_ext.h 229 2002-12-27 13:11:01Z mein $"
-#define EDITLATTICE_EXT_H "Copyright (C) 2001 NaN Technologies B.V.
-
-void end_latt_deform(void);
-
-#endif /* EDITLATTICE_EXT_H */
-
diff --git a/source/blender/editors/include/editmesh.h b/source/blender/editors/include/editmesh.h
deleted file mode 100644
index 1b2d91e22b8..00000000000
--- a/source/blender/editors/include/editmesh.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * $Id: 
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-/* Internal for editmesh_xxxx.c functions */
-
-#ifndef EDITMESH_H
-#define EDITMESH_H
-
-#define TEST_EDITMESH	if(G.obedit==0) return; \
-						if( (G.vd->lay & G.obedit->lay)==0 ) return;
-
-#define UVCOPY(t, s) memcpy(t, s, 2 * sizeof(float));
-
-
-
-/* ******************* editmesh.c */
-extern void free_editvert(EditVert *eve);
-extern void free_editedge(EditEdge *eed);
-extern void free_editface(EditFace *efa);
-
-extern void free_vertlist(ListBase *edve);
-extern void free_edgelist(ListBase *lb);
-extern void free_facelist(ListBase *lb);
-
-extern void remedge(EditEdge *eed);
-
-extern struct EditVert *addvertlist(float *vec, struct EditVert *example);
-extern struct EditEdge *addedgelist(struct EditVert *v1, struct EditVert *v2, struct EditEdge *example);
-extern struct EditFace *addfacelist(struct EditVert *v1, struct EditVert *v2, struct EditVert *v3, struct EditVert *v4, struct EditFace *example, struct EditFace *exampleEdges);
-extern struct EditEdge *findedgelist(struct EditVert *v1, struct EditVert *v2);
-
-/* ******************* editmesh_add.c */
-
-
-/* ******************* editmesh_lib.c */
-extern void EM_fgon_flags(void);
-extern void EM_hide_reset(void);
-
-extern int faceselectedOR(EditFace *efa, int flag);
-extern int faceselectedAND(EditFace *efa, int flag);
-
-extern EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4);
-extern void flipface(EditFace *efa); // flips for normal direction
-extern int compareface(EditFace *vl1, EditFace *vl2);
-
-/* flag for selection bits, *nor will be filled with normal for extrusion constraint */
-/* return value defines if such normal was set */
-extern short extrudeflag_face_indiv(short flag, float *nor);
-extern short extrudeflag_verts_indiv(short flag, float *nor);
-extern short extrudeflag_edges_indiv(short flag, float *nor);
-extern short extrudeflag_vert(short flag, float *nor);
-extern short extrudeflag(short flag, float *nor);
-
-extern void adduplicateflag(int flag);
-extern void delfaceflag(int flag);
-
-extern void rotateflag(short flag, float *cent, float rotmat[][3]);
-extern void translateflag(short flag, float *vec);
-
-extern int convex(float *v1, float *v2, float *v3, float *v4);
-
-/* ******************* editmesh_mods.c */
-extern EditEdge *findnearestedge(int *dist);
-extern void EM_automerge(int update);
-
-/**
- * findnearestvert
- * 
- * dist (in/out): minimal distance to the nearest and at the end, actual distance
- * sel: selection bias
- * 		if SELECT, selected vertice are given a 5 pixel bias to make them farter than unselect verts
- * 		if 0, unselected vertice are given the bias
- * strict: if 1, the vertice corresponding to the sel parameter are ignored and not just biased 
- */
-extern EditVert *findnearestvert(int *dist, short sel, short strict);
-
-/* ******************* editmesh_tools.c */
-
-
-#endif
-
diff --git a/source/blender/editors/include/interface.h b/source/blender/editors/include/interface.h
deleted file mode 100644
index 18f0db03881..00000000000
--- a/source/blender/editors/include/interface.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * $Id: interface.h 11920 2007-09-02 17:25:03Z elubie $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef INTERFACE_H
-#define INTERFACE_H
-
-#include "BIF_resources.h"
-
-/* general defines */
-
-#define UI_MAX_DRAW_STR	400
-#define UI_MAX_NAME_STR	64
-#define UI_ARRAY	29
-
-/* panel limits */
-#define UI_PANEL_MINX	100
-#define UI_PANEL_MINY	70
-
-/* uiBut->flag */
-#define UI_SELECT		1
-#define UI_MOUSE_OVER	2
-#define UI_ACTIVE		4
-#define UI_HAS_ICON		8
-/* warn: rest of uiBut->flag in BIF_interface.c */
-
-
-/* internal panel drawing defines */
-#define PNL_GRID	4
-#define PNL_DIST	8
-#define PNL_SAFETY 	8
-#define PNL_HEADER  20
-
-/* panel->flag */
-#define PNL_SELECT	1
-#define PNL_CLOSEDX	2
-#define PNL_CLOSEDY	4
-#define PNL_CLOSED	6
-#define PNL_TABBED	8
-#define PNL_OVERLAP	16
-
-/* Button text selection:
- * extension direction, selextend, inside ui_do_but_TEX */
-#define EXTEND_LEFT		1
-#define EXTEND_RIGHT	2
-
-typedef struct {
-	short xim, yim;
-	unsigned int *rect;
-	short xofs, yofs;
-} uiIconImage;
-
-typedef struct {
-	short mval[2];
-	short qual, val;
-	int event;
-} uiEvent;
-
-typedef struct {
-	void *xl, *large, *medium, *small;
-} uiFont;
-
-typedef struct uiLinkLine {				/* only for draw/edit */
-	struct uiLinkLine *next, *prev;
-
-	short flag, pad;
-	
-	struct uiBut *from, *to;	
-} uiLinkLine;
-
-typedef struct {
-	void **poin;		/* pointer to original pointer */
-	void ***ppoin;		/* pointer to original pointer-array */
-	short *totlink;		/* if pointer-array, here is the total */
-	
-	short maxlink, pad;
-	short fromcode, tocode;
-	
-	ListBase lines;
-} uiLink;
-
-struct uiBut {
-	struct uiBut *next, *prev;
-	short type, pointype, bit, bitnr, retval, strwidth, ofs, pos, selsta, selend;
-	int flag;
-	
-	char *str;
-	char strdata[UI_MAX_NAME_STR];
-	char drawstr[UI_MAX_DRAW_STR];
-	
-	float x1, y1, x2, y2;
-
-	char *poin;
-	float min, max;
-	float a1, a2, hsv[3];	// hsv is temp memory for hsv buttons
-	float aspect;
-
-	void (*func)(void *, void *);
-	void *func_arg1;
-	void *func_arg2;
-
-	void (*embossfunc)(int , int , float, float, float, float, float, int);
-	void (*sliderfunc)(int , float, float, float, float, float, float, int);
-
-	void (*autocomplete_func)(char *, void *);
-	void *autofunc_arg;
-	
-	uiLink *link;
-	
-	char *tip, *lockstr;
-
-	int themecol;	/* themecolor id */
-	void *font;
-
-	BIFIconID icon;
-	short but_align;	/* aligning buttons, horiz/vertical */
-	short lock, win;
-	short iconadd, dt;
-
-		/* IDPOIN data */
-	uiIDPoinFuncFP idpoin_func;
-	ID **idpoin_idpp;
-
-		/* BLOCK data */
-	uiBlockFuncFP block_func;
-
-		/* BUTM data */
-	void (*butm_func)(void *arg, int event);
-	void *butm_func_arg;
-	
-		/* pointer back */
-	uiBlock *block;
-};
-
-struct uiBlock {
-	uiBlock *next, *prev;
-	
-	ListBase buttons;
-	Panel *panel;
-	
-	char name[UI_MAX_NAME_STR];
-	
-	float winmat[4][4];
-	
-	float minx, miny, maxx, maxy;
-	float aspect;
-
-	void (*butm_func)(void *arg, int event);
-	void *butm_func_arg;
-
-	void (*func)(void *arg1, void *arg2);
-	void *func_arg1;
-	void *func_arg2;
-	
-	/* extra draw function for custom blocks */
-	void (*drawextra)();
-
-	int themecol;	/* themecolor id */
-	
-	short font;	/* indices */
-	int afterval, flag;
-	void *curfont;
-	
-	short autofill, win, winq, direction, dt;
-	short needflush, auto_open, in_use, pad;  //flush see below
-	void *overdraw;
-	struct uiBlock *parent;	// nested pulldowns
-	
-	float xofs, yofs;		// offset to parent button
-	rctf parentrct;			// for pulldowns, rect the mouse is allowed outside of menu (parent button)
-	rctf safety;			// pulldowns, to detect outside, can differ per case how it is created
-
-	rctf flush;				// rect to be flushed to frontbuffer
-	int handler;			// for panels in other windows than buttonswin... just event code
-};
-
-/* interface.c */
-
-extern void ui_graphics_to_window(int win, float *x, float *y);
-extern void ui_graphics_to_window_rct(int win, rctf *graph, rcti *winr);
-extern void ui_window_to_graphics(int win, float *x, float *y);
-
-extern void ui_block_flush_back(uiBlock *block);
-extern void ui_block_set_flush(uiBlock *block, uiBut *but);
-
-extern void ui_check_but(uiBut *but);
-extern double ui_get_but_val(uiBut *but);
-extern void ui_get_but_vectorf(uiBut *but, float *vec);
-extern void ui_set_but_vectorf(uiBut *but, float *vec);
-extern void ui_autofill(uiBlock *block);
-
-/* interface_panel.c */
-extern void ui_draw_panel(uiBlock *block);
-extern void ui_do_panel(uiBlock *block, uiEvent *uevent);
-extern void ui_scale_panel(uiBlock *block);
-extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad);
-extern void gl_round_box_shade(int mode, float minx, float miny, float maxx, float maxy, float rad, float shadetop, float shadedown);
-
-/* interface_draw.c */
-extern void ui_set_embossfunc(uiBut *but, int drawtype);
-extern void ui_draw_but(uiBut *but);
-extern void ui_rasterpos_safe(float x, float y, float aspect);
-extern void ui_draw_tria_icon(float x, float y, float aspect, char dir);
-extern void ui_draw_anti_x(float x1, float y1, float x2, float y2);
-extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
-
-#endif
-
diff --git a/source/blender/editors/include/keyed_functions.h b/source/blender/editors/include/keyed_functions.h
deleted file mode 100644
index 3549795b399..00000000000
--- a/source/blender/editors/include/keyed_functions.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * $Id: keyed_functions.h 540 2003-03-23 21:42:31Z zuster $ 
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#define KEY_GETPTR(x) (g_ptrtab ? g_ptrtab[x] : 0)
-
-/* these are the defines for the keyed functions:
-
-	 #define key_func<n>  <function name to be behind key>
-
-   This function must be of type "int func(void*)"
-
-   To prevent symbol table dumpers from retrieving certain key
-   functions too easily, some of those functions have nonsense names.
-*/
-
-#define key_func1 key_return_true
-/* add the corresponding function pointer defines here.
-   Example:
-
-	   #define key_func4 my_protected_function_name
-	   #define MY_PROTECTED_FUNCTION_PTR  KEY_GETPTR(KEY_FUNC3)
-
-   KEY_GETPTR(KEY_FUNC3) corresponds to the function pointer to function
-   key_func3 after the python key code unscrambled the function pointer tables.
-   Also add pointer initializations to these functions in 
-   license_key.c:init_ftable() if necessary.
-*/
-
-#define KEY_RETURN_TRUE			KEY_GETPTR(KEY_FUNC1)
-
diff --git a/source/blender/editors/include/license_key.h b/source/blender/editors/include/license_key.h
deleted file mode 100644
index 1f9fa09a1f5..00000000000
--- a/source/blender/editors/include/license_key.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * $Id: license_key.h 229 2002-12-27 13:11:01Z mein $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-#ifndef LICENCEKEY_H
-#define LICENCEKEY_H
-
-#define I_AM_PUBLISHER temp_val2
-#define LICENSE_KEY_VALID temp_val
-#define SHOW_LICENSE_KEY rotop
-
-extern int LICENSE_KEY_VALID;
-extern int I_AM_PUBLISHER;
-
-extern char * license_key_name;
-extern void loadKeyboard(char * name);
-extern void checkhome(void);
-extern void SHOW_LICENSE_KEY(void);
-
-#define LICENSE_CHECK_0 (0==0)
-
-// Stuff from the Python files from Strubi
-
-typedef int (*Fptr)(void *);
-
-extern Fptr g_functab[];
-extern Fptr g_ptrtab[];
-
-// TODO: From here on, this should be a generated header file...
-
-// change all KEY_FUNC values 
-// if you change PYKEY_TABLEN or PYKEY_SEED
-// see below
-
-#define PYKEY_TABLEN 21 // don't change this unless needed. Other values
-                        // may yield bad random orders
-
-#define PYKEY_SEED {26,8,1972}
-
-// these values are generated by $HOME/develop/intern/keymaker/makeseed.py
-// from the above seed value. 
-
-// DO NOT EDIT THESE VALUES BY HAND!
-
-#define KEY_FUNC1 12
-#define KEY_FUNC2 8
-#define KEY_FUNC3 1
-#define KEY_FUNC4 16
-#define KEY_FUNC5 20
-#define KEY_FUNC6 18
-#define KEY_FUNC7 13
-#define KEY_FUNC8 6
-#define KEY_FUNC9 9
-#define KEY_FUNC10 7
-#define KEY_FUNC11 14
-#define KEY_FUNC12 0
-#define KEY_FUNC13 5
-#define KEY_FUNC14 10
-#define KEY_FUNC15 19
-#define KEY_FUNC16 2
-#define KEY_FUNC17 11
-#define KEY_FUNC18 3
-#define KEY_FUNC19 17
-#define KEY_FUNC20 15
-#define KEY_FUNC21 4
-
-#endif
-
diff --git a/source/blender/editors/include/multires.h b/source/blender/editors/include/multires.h
deleted file mode 100644
index 470084e9c5f..00000000000
--- a/source/blender/editors/include/multires.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * $Id: multires.h 11480 2007-08-03 16:33:08Z campbellbarton $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software  Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2006 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */ 
-
-#ifndef MULTIRES_H
-#define MULTIRES_H
-
-struct CustomData;
-struct EditMesh;
-struct Object;
-struct MDeformVert;
-struct Mesh;
-struct MultiresLevel;
-struct Multires;
-struct uiBlock;
-
-/* For canceling operations that don't work with multires on or on a non-base level */
-int multires_test();
-int multires_level1_test();
-
-struct MultiresLevel *multires_level_n(struct Multires *mr, int n);
-
-void multires_draw_interface(struct uiBlock *block, unsigned short cx, unsigned short cy);
-void multires_disp_map(void *, void*);
-
-void multires_make(void *ob, void *me);
-void multires_delete(void *ob, void *me);
-struct Multires *multires_copy(struct Multires *orig);
-void multires_free(struct Multires *mr);
-void multires_free_level(struct MultiresLevel *lvl);
-void multires_del_lower(void *ob, void *me);
-void multires_del_higher(void *ob, void *me);
-void multires_add_level(void *ob, void *me);
-void multires_set_level_cb(void *ob, void *me);
-void multires_set_level(struct Object *ob, struct Mesh *me, const int render);
-void multires_update_levels(struct Mesh *me, const int render);
-void multires_level_to_mesh(struct Object *ob, struct Mesh *me, const int render);
-void multires_edge_level_update(void *ob, void *me);
-int multires_modifier_warning();
-
-/* after adding or removing vcolor layers, run this */
-void multires_load_cols(Mesh *me);
-
-/* multires-firstlevel.c */
-/* Generic */
-void multires_update_first_level(struct Mesh *me, struct EditMesh *em);
-void multires_update_customdata(struct MultiresLevel *lvl1, struct CustomData *src,
-                                struct CustomData *dst, const int type);
-void multires_customdata_to_mesh(struct Mesh *me, struct EditMesh *em, struct MultiresLevel *lvl,
-                                 struct CustomData *src, struct CustomData *dst, const int type);
-void multires_del_lower_customdata(struct Multires *mr, struct MultiresLevel *cr_lvl);
-
-void multires_add_layer(struct Mesh *me, struct CustomData *cd, const int type, const int n);
-void multires_delete_layer(struct Mesh *me, struct CustomData *cd, const int type, int n);
-
-#endif
diff --git a/source/blender/editors/include/mydevice.h b/source/blender/editors/include/mydevice.h
deleted file mode 100644
index e2b9b529e9b..00000000000
--- a/source/blender/editors/include/mydevice.h
+++ /dev/null
@@ -1,260 +0,0 @@
-
-#ifndef __MYDEVICE_H__
-#define __MYDEVICE_H__
-
-/*
- *  This file has its origin at sgi, where all device defines were written down.
- *  Blender copied this concept quite some, and expanded it with internal new defines (ton)
- *
- *   mouse / timer / window: until 0x020
- *   custom codes: 0x4...
- * 
- * $Id: mydevice.h 12385 2007-10-24 18:58:26Z campbellbarton $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-/* MOUSE : 0x00x */
-
-#define LEFTMOUSE	0x001	
-#define MIDDLEMOUSE	0x002	
-#define RIGHTMOUSE	0x003	
-#define MOUSEX		0x004	
-#define MOUSEY		0x005	
-#define WHEELUPMOUSE	0x00a	
-#define WHEELDOWNMOUSE	0x00b	
-
-/* timers */
-
-#define TIMER0		0x006	
-#define TIMER1		0x007	
-#define TIMER2		0x008	
-#define TIMER3		0x009	
-
-/* SYSTEM : 0x01x */
-
-#define KEYBD			0x010	/* keyboard */
-#define RAWKEYBD		0x011	/* raw keyboard for keyboard manager */
-#define REDRAW			0x012	/* used by port manager to signal redraws */
-#define	INPUTCHANGE		0x013	/* input connected or disconnected */
-#define	QFULL			0x014	/* queue was filled */
-#define WINFREEZE		0x015	/* user wants process in this win to shut up */
-#define WINTHAW			0x016	/* user wants process in this win to go again */
-#define WINCLOSE		0x017	/* window close */
-#define WINQUIT			0x018	/* signal from user that app is to go away */
-#define Q_FIRSTTIME		0x019	/* on startup */
-
-/* standard keyboard */
-
-#define AKEY		'a'
-#define BKEY		'b'
-#define CKEY		'c'
-#define DKEY		'd'
-#define EKEY		'e'
-#define FKEY		'f'
-#define GKEY		'g'
-#define HKEY		'h'
-#define IKEY		'i'
-#define JKEY		'j'
-#define KKEY		'k'
-#define LKEY		'l'
-#define MKEY		'm'
-#define NKEY		'n'
-#define OKEY		'o'
-#define PKEY		'p'
-#define QKEY		'q'
-#define RKEY		'r'
-#define SKEY		's'
-#define TKEY		't'
-#define UKEY		'u'
-#define VKEY		'v'
-#define WKEY		'w'
-#define XKEY		'x'
-#define YKEY		'y'
-#define ZKEY		'z'
-
-#define ZEROKEY		'0'
-#define ONEKEY		'1'
-#define TWOKEY		'2'
-#define THREEKEY	'3'
-#define FOURKEY		'4'
-#define FIVEKEY		'5'
-#define SIXKEY		'6'
-#define SEVENKEY	'7'
-#define EIGHTKEY	'8'
-#define NINEKEY		'9'
-
-#define CAPSLOCKKEY		211
-
-#define LEFTCTRLKEY		212
-#define LEFTALTKEY 		213
-#define	RIGHTALTKEY 	214
-#define	RIGHTCTRLKEY 	215
-#define RIGHTSHIFTKEY	216
-#define LEFTSHIFTKEY	217
-
-#define ESCKEY			218
-#define TABKEY			219
-#define RETKEY			220
-#define SPACEKEY		221
-#define LINEFEEDKEY		222
-#define BACKSPACEKEY	223
-#define DELKEY			224
-#define SEMICOLONKEY	225
-#define PERIODKEY		226
-#define COMMAKEY		227
-#define QUOTEKEY		228
-#define ACCENTGRAVEKEY	229
-#define MINUSKEY		230
-#define SLASHKEY		232
-#define BACKSLASHKEY	233
-#define EQUALKEY		234
-#define LEFTBRACKETKEY	235
-#define RIGHTBRACKETKEY	236
-
-#define LEFTARROWKEY	137
-#define DOWNARROWKEY	138
-#define RIGHTARROWKEY	139
-#define UPARROWKEY		140
-
-#define PAD0			150
-#define PAD1			151
-#define PAD2			152
-#define PAD3			153
-#define PAD4			154
-#define PAD5			155
-#define PAD6			156
-#define PAD7			157
-#define PAD8			158
-#define PAD9			159
-
-
-#define PADPERIOD		199
-#define	PADSLASHKEY 	161
-#define PADASTERKEY 	160
-
-
-#define PADMINUS		162
-#define PADENTER		163
-#define PADPLUSKEY 		164
-
-
-#define	F1KEY 		300
-#define	F2KEY 		301
-#define	F3KEY 		302
-#define	F4KEY 		303
-#define	F5KEY 		304
-#define	F6KEY 		305
-#define	F7KEY 		306
-#define	F8KEY 		307
-#define	F9KEY 		308
-#define	F10KEY		309
-#define	F11KEY		310
-#define	F12KEY		311
-
-#define	PAUSEKEY	165
-#define	INSERTKEY	166
-#define	HOMEKEY 	167
-#define	PAGEUPKEY 	168
-#define	PAGEDOWNKEY	169
-#define	ENDKEY		170
-
-#define UNKNOWNKEY	171
-#define COMMANDKEY	172
-#define GRLESSKEY	173
-
-/* used as fake leftmouse events, special handled in interface.c */
-#define BUT_ACTIVATE	200
-#define BUT_NEXT		201
-#define BUT_PREV		202
-
-/* **************** BLENDER QUEUE EVENTS ********************* */
-
-#define CHANGED				0x4000
-#define DRAWEDGES			0x4001
-#define AFTERQUEUE			0x4002
-#define BACKBUFDRAW			0x4003
-#define EXECUTE				0x4004
-#define IGNORE_REDRAW		0x4005
-#define LOAD_FILE			0x4006
-#define RESHAPE				0x4007
-#define UI_BUT_EVENT		0x4008
-#define AUTOSAVE_FILE		0x4009
-#define UNDOPUSH			0x400A
-
-/* REDRAWVIEW3D has to be the first one (lowest number) for buttons! */
-#define REDRAWVIEW3D		0x4010
-#define REDRAWVIEWCAM		0x4011
-#define REDRAWVIEW3D_Z		0x4012
-
-#define REDRAWALL			0x4013
-#define REDRAWHEADERS		0x4014
-
-#define REDRAWBUTSHEAD		0x4015
-#define REDRAWBUTSALL		0x4016
-
-#define REDRAWBUTSSCENE		0x4017
-#define REDRAWBUTSOBJECT	0x4018
-#define REDRAWBUTSEDIT		0x4019
-#define REDRAWBUTSSCRIPT	0x401A
-#define REDRAWBUTSLOGIC		0x401B
-#define REDRAWBUTSSHADING	0x401C
-#define REDRAWBUTSGAME		0x401D
-#define REDRAWBUTSEFFECTS	0x401D
-
-#define REDRAWINFO			0x4021
-#define RENDERPREVIEW		0x4022
-#define REDRAWIPO			0x4023
-#define REDRAWDATASELECT	0x4024
-#define REDRAWSEQ			0x4025
-#define REDRAWIMAGE			0x4026
-#define REDRAWOOPS			0x4027
-#define REDRAWIMASEL        0x4028
-#define AFTERIMASELIMA      0x4029
-#define AFTERIMASELGET      0x402A
-#define AFTERIMAWRITE       0x402B
-#define IMALEFTMOUSE		0x402C
-#define AFTERPIBREAD        0x402D
-#define REDRAWTEXT	        0x402E
-#define REDRAWSOUND			0x402F
-#define REDRAWACTION		0x4030
-#define REDRAWNLA			0x4031
-#define REDRAWSCRIPT		0x4032
-#define REDRAWTIME			0x4033
-#define REDRAWBUTSCONSTRAINT	0x4034
-#define ONLOAD_SCRIPT		0x4035
-#define SCREEN_HANDLER		0x4036
-#define REDRAWANIM			0x4037
-#define REDRAWNODE			0x4038
-#define RECALC_COMPOSITE	0x4039
-#define REDRAWMARKER		0x4040 /* all views that display markers */
-#define REDRAWVIEW3D_IMAGE	0x4041
-
-#endif	/* !__MYDEVICE_H__ */
-
diff --git a/source/blender/editors/include/nla.h b/source/blender/editors/include/nla.h
deleted file mode 100644
index fd3a0b74d01..00000000000
--- a/source/blender/editors/include/nla.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* nla.h   May 2001
- * $Id: nla.h 4664 2005-07-09 19:37:38Z ton $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- *  
- * XXX THIS FILE SHOULD BE REMOVED! (TON)
- * $Id: nla.h 4664 2005-07-09 19:37:38Z ton $
- */
-
-#ifndef NLA_H
-#define NLA_H
-
-#define __NLA			
-
-#define __CON_IPO							//	Not for Release: Not yet fully implemented
-//#define __NLA_ACTION_BY_MOTION_ACTUATOR	//	Not for release: Not yet fully implemented
-
-#endif
-
diff --git a/source/blender/editors/include/objfnt.h b/source/blender/editors/include/objfnt.h
deleted file mode 100644
index 7ba8d1b03e5..00000000000
--- a/source/blender/editors/include/objfnt.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $Id: objfnt.h 229 2002-12-27 13:11:01Z mein $ 
-*/
-/*
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
-#ifndef OBJFNTDEF
-#define OBJFNTDEF
-
-typedef struct chardesc {
-    short movex, movey;		/* advance */
-    short llx, lly;		/* bounding box */
-    short urx, ury;
-    short *data;		/* char data */
-    long datalen;		
-} chardesc;
-
-typedef struct objfnt {
-    struct objfnt *freeaddr;	/* if freeaddr != 0, objfnt is one chunck */
-    short type;
-    short charmin, charmax;
-    short my_nchars;
-    short scale;
-    chardesc *my_chars;
-} objfnt;
-
-#define OFMAGIC		0x93339333
-
-#define TM_TYPE		1
-#define PO_TYPE		2
-#define SP_TYPE		3
-
-/* ops for tmesh characters */
-
-#define	TM_BGNTMESH	(1)
-#define	TM_SWAPTMESH	(2)
-#define	TM_ENDBGNTMESH	(3)
-#define	TM_RETENDTMESH	(4)
-#define	TM_RET		(5)
-
-/* ops for poly characters */
-
-#define	PO_BGNLOOP	(1)
-#define	PO_ENDBGNLOOP	(2)
-#define	PO_RETENDLOOP	(3)
-#define	PO_RET		(4)
-
-/* ops for spline  characters */
-
-#define	SP_MOVETO	(1)
-#define	SP_LINETO	(2)
-#define	SP_CURVETO	(3)
-#define	SP_CLOSEPATH	(4)
-#define	SP_RETCLOSEPATH	(5)
-#define	SP_RET		(6)
-
-
-#define MIN_ASCII 	' '
-#define MAX_ASCII 	'~'
-#define NASCII		(256 - 32)
-
-#define NOBBOX		(30000)
-
-typedef struct pschar {
-    char *name;
-    int code;
-    int prog;
-} pschar;
-
-extern pschar charlist[NASCII];
-
-/*  objfnt *fontname(void); */
-/*  objfnt *readobjfnt(void); */
-/*  objfnt *newobjfnt(void); */
-/*  float fontstringwidth(void); */
-/*  short *getcharprog(void); */
-/*  chardesc *BLI_getchardesc(void); */
-/*  char *asciiname(void); */
-
-#endif
-
diff --git a/source/blender/editors/include/particle_effect.h b/source/blender/editors/include/particle_effect.h
deleted file mode 100644
index 656c88c5618..00000000000
--- a/source/blender/editors/include/particle_effect.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* dec 95
- * jan feb 96
- * $Id: particle_effect.h 4851 2005-07-20 04:14:21Z zuster $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef PARTICLE_EFFECT_H
-#define PARTICLE_EFFECT_H
-
-/* effect.c */
-extern Effect *add_effect(int type);
-extern PartEff *give_parteff(Object *ob);
-extern void where_is_particle(PartEff *paf, Particle *pa, float ctime, float *vec);
-extern void free_effect(Effect *eff);
-extern void free_effects(ListBase *lb);
-extern void copy_effects(ListBase *lbn, ListBase *lb);
-extern void build_particle_system(Object *ob);
-
-#endif
-
diff --git a/source/blender/editors/include/playanim_ext.h b/source/blender/editors/include/playanim_ext.h
deleted file mode 100644
index 353ed04f3d7..00000000000
--- a/source/blender/editors/include/playanim_ext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * external interface
- * $Id: playanim_ext.h 229 2002-12-27 13:11:01Z mein $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef PLAYANIM_EXT_H
-#define PLAYANIM_EXT_H
-
-/* used in apps */
-void playanim(int argc, char **argv);
-
-#endif
-
diff --git a/source/blender/editors/include/transform.h b/source/blender/editors/include/transform.h
deleted file mode 100644
index bf9d96a6658..00000000000
--- a/source/blender/editors/include/transform.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/**
- * $Id: transform.h 12682 2007-11-26 22:09:57Z blendix $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef TRANSFORM_H
-#define TRANSFORM_H
-
-#include "BIF_transform.h"
-
-/* ************************** Types ***************************** */
-
-struct TransInfo;
-struct TransData;
-struct TransSnap;
-struct NumInput;
-struct Object;
-struct View3D;
-struct ScrArea;
-struct bPose;
-
-
-typedef struct NumInput {
-    short  idx;
-    short  idx_max;
-    short  flag;        /* Different flags to indicate different behaviors                                */
-    float  val[3];       /* Direct value of the input                                                      */
-    int  ctrl[3];      /* Control to indicate what to do with the numbers that are typed                 */
-} NumInput ;
-
-/*
-	The ctrl value has different meaning:
-		0			: No value has been typed
-		
-		otherwise, |value| - 1 is where the cursor is located after the period
-		Positive	: number is positive
-		Negative	: number is negative
-*/
-
-typedef struct TransSnap {
-	short	modePoint;
-	short	modeTarget;
-	int  	status;
-	float	snapPoint[3];
-	float	snapTarget[3];
-	float	dist; // Distance from snapPoint to snapTarget
-	double	last;
-	void  (*applySnap)(struct TransInfo *, float *);
-	void  (*calcSnap)(struct TransInfo *, float *);
-	void  (*targetSnap)(struct TransInfo *);
-	float  (*distance)(struct TransInfo *, float p1[3], float p2[3]); // Get the transform distance between two points (used by Closest snap)
-} TransSnap;
-
-typedef struct TransCon {
-    char  text[50];      /* Description of the Constraint for header_print                            */
-    float mtx[3][3];     /* Matrix of the Constraint space                                            */
-    float imtx[3][3];    /* Inverse Matrix of the Constraint space                                    */
-    float pmtx[3][3];    /* Projection Constraint Matrix (same as imtx with some axis == 0)           */
-    float center[3];     /* transformation center to define where to draw the view widget             
-                            ALWAYS in global space. Unlike the transformation center                  */
-	short imval[2];	     /* initial mouse value for visual calculation                                */
-	                     /* the one in TransInfo is not garanty to stay the same (Rotates change it)  */
-    int   mode;          /* Mode flags of the Constraint                                              */
-	void  (*drawExtra)(struct TransInfo *);
-						 /* For constraints that needs to draw differently from the other
-							uses this instead of the generic draw function							  */
-    void  (*applyVec)(struct TransInfo *, struct TransData *, float *, float *, float *);
-                         /* Apply function pointer for linear vectorial transformation                */
-                         /* The last three parameters are pointers to the in/out/printable vectors    */
-    void  (*applySize)(struct TransInfo *, struct TransData *, float [3][3]);
-                         /* Apply function pointer for rotation transformation (prototype will change */
-    void  (*applyRot)(struct TransInfo *, struct TransData *, float [3]);
-                         /* Apply function pointer for rotation transformation (prototype will change */
-} TransCon;
-
-typedef struct TransDataIpokey {
-	int flag;					/* which keys */
-	float *locx, *locy, *locz;	/* channel pointers */
-	float *rotx, *roty, *rotz;
-	float *quatx, *quaty, *quatz, *quatw;
-	float *sizex, *sizey, *sizez;
-	float oldloc[9];			/* storage old values */
-	float oldrot[9];
-	float oldsize[9];
-	float oldquat[12];
-} TransDataIpokey;
-
-typedef struct TransDataExtension {
-	float drot[3];		 /* Initial object drot */
-	float dsize[3];		 /* Initial object dsize */
-    float *rot;          /* Rotation of the data to transform (Faculative)                                 */
-    float  irot[3];      /* Initial rotation                                                               */
-    float *quat;         /* Rotation quaternion of the data to transform (Faculative)                      */
-    float  iquat[4];	 /* Initial rotation quaternion                                                    */
-    float *size;         /* Size of the data to transform (Faculative)                                     */
-    float  isize[3];	 /* Initial size                                                                   */
-	float  obmat[3][3];	 /* Object matrix */  
-} TransDataExtension;
-
-typedef struct TransData2D {
-	float loc[3];		/* Location of data used to transform (x,y,0) */
-	float *loc2d;		/* Pointer to real 2d location of data */
-} TransData2D;
-
-typedef struct TransData {
-	float  dist;         /* Distance needed to affect element (for Proportionnal Editing)                  */
-	float  rdist;        /* Distance to the nearest element (for Proportionnal Editing)                    */
-	float  factor;       /* Factor of the transformation (for Proportionnal Editing)                       */
-    float *loc;          /* Location of the data to transform                                              */
-    float  iloc[3];      /* Initial location                                                               */
-	float *val;          /* Value pointer for special transforms */
-	float  ival;         /* Old value*/
-    float  center[3];	 /* Individual data center                                                         */
-    float  mtx[3][3];    /* Transformation matrix from data space to global space                          */
-    float  smtx[3][3];   /* Transformation matrix from global space to data space                          */
-	float  axismtx[3][3];/* Axis orientation matrix of the data                                            */
-	struct Object *ob;
-	TransDataExtension *ext;	/* for objects, poses. 1 single malloc per TransInfo! */
-	TransDataIpokey *tdi;		/* for objects, ipo keys. per transdata a malloc */
-	void *tdmir;		 /* mirrored element pointer, in editmode mesh to EditVert */
-    short  flag;         /* Various flags */
-	short  protectflag;	 /* If set, copy of Object or PoseChannel protection */
-/*#ifdef WITH_VERSE*/
-	void *verse;			/* pointer at verse data struct (VerseVert, etc.) */
-/*#endif*/
-} TransData;
-
-typedef struct TransInfo {
-    int         mode;           /* current mode                         */
-    int	        flag;           /* generic flags for special behaviors  */
-	short		state;			/* current state (running, canceled,...)*/
-    int         context;        /* current context                      */
-    float       val;            /* init value for some transformations (and rotation angle)  */
-    float       fac;            /* factor for distance based transform  */
-    int       (*transform)(struct TransInfo *, short *);
-                                /* transform function pointer           */
-	int       (*handleEvent)(struct TransInfo *, unsigned short event, short val);
-								/* event handler function pointer  RETURN 1 if redraw is needed */
-    int         total;          /* total number of transformed data     */
-    TransData  *data;           /* transformed data (array)             */
-	TransDataExtension *ext;	/* transformed data extension (array)   */
-	TransData2D *data2d;		/* transformed data for 2d (array)      */
-    TransCon    con;            /* transformed constraint               */
-    TransSnap	tsnap;
-    NumInput    num;            /* numerical input                      */
-    char        redraw;         /* redraw flag                          */
-	float		propsize;		/* proportional circle radius           */
-	char		proptext[20];	/* proportional falloff text			*/
-    float       center[3];      /* center of transformation             */
-    int         center2d[2];    /* center in screen coordinates         */
-    short       imval[2];       /* initial mouse position               */
-	short		shiftmval[2];	/* mouse position when shift was pressed */
-	short       idx_max;		/* maximum index on the input vector	*/
-	float		snap[3];		/* Snapping Gears						*/
-	
-	float		viewmat[4][4];	/* copy from G.vd, prevents feedback,   */
-	float		viewinv[4][4];  /* and to make sure we don't have to    */
-	float		persmat[4][4];  /* access G.vd from other space types   */
-	float		persinv[4][4];
-	short		persp;
-	short		around;
-	char		spacetype;		/* spacetype where transforming is      */
-	
-	float		vec[3];			/* translation, to show for widget   	*/
-	float		mat[3][3];		/* rot/rescale, to show for widget   	*/
-	
-	char		*undostr;		/* if set, uses this string for undo		*/
-	float		spacemtx[3][3];	/* orientation matrix of the current space	*/
-	char		spacename[32];	/* name of the current space				*/
-	
-	struct Object *poseobj;		/* if t->flag & T_POSE, this denotes pose object */
-	
-	void       *customData;		/* Per Transform custom data */
-} TransInfo;
-
-
-/* ******************** Macros & Prototypes *********************** */
-
-/* NUMINPUT FLAGS */
-#define NUM_NULL_ONE		2
-#define NUM_NO_NEGATIVE		4
-#define	NUM_NO_ZERO			8
-#define NUM_NO_FRACTION		16
-#define	NUM_AFFECT_ALL		32
-
-/* transinfo->state */
-#define TRANS_RUNNING	0
-#define TRANS_CONFIRM	1
-#define TRANS_CANCEL	2
-
-/* transinfo->flag */
-#define T_OBJECT		(1 << 0)
-#define T_EDIT			(1 << 1)
-#define T_POSE			(1 << 2)
-#define T_TEXTURE		(1 << 3)
-#define T_CAMERA		(1 << 4)
-		// when shift pressed, higher resolution transform. cannot rely on G.qual, need event!
-#define T_SHIFT_MOD		(1 << 5)
-	 	// trans on points, having no rotation/scale 
-#define T_POINTS		(1 << 6)
-		// for manipulator exceptions, like scaling using center point, drawing help lines
-#define T_USES_MANIPULATOR	(1 << 7)
-
-/* restrictions flags */
-#define T_ALL_RESTRICTIONS	((1 << 8)|(1 << 9)|(1 << 10))
-#define T_NO_CONSTRAINT		(1 << 8)
-#define T_NULL_ONE			(1 << 9)
-#define T_NO_ZERO			(1 << 10)
-
-#define T_PROP_EDIT			(1 << 11)
-#define T_PROP_CONNECTED	(1 << 12)
-
-/* if MMB is pressed or not */
-#define	T_MMB_PRESSED		(1 << 13)
-
-#define T_V3D_ALIGN			(1 << 14)
-#define T_2D_EDIT			(1 << 15) /* for 2d views like uv or ipo */
-#define T_CLIP_UV			(1 << 16)
-
-#define T_FREE_CUSTOMDATA	(1 << 17)
-
-/* ******************************************************************************** */
-
-/* transinfo->con->mode */
-#define CON_APPLY		1
-#define CON_AXIS0		2
-#define CON_AXIS1		4
-#define CON_AXIS2		8
-#define CON_SELECT		16
-#define CON_NOFLIP		32	/* does not reorient vector to face viewport when on */
-#define CON_LOCAL		64
-#define CON_USER		128
-
-/* transdata->flag */
-#define TD_SELECTED			1
-#define	TD_NOACTION			2
-#define	TD_USEQUAT			4
-#define TD_NOTCONNECTED		8
-#define TD_SINGLESIZE		16	/* used for scaling of MetaElem->rad */
-#ifdef WITH_VERSE
-	#define TD_VERSE_OBJECT		32
-	#define TD_VERSE_VERT		64
-#endif
-#define TD_TIMEONLY			128
-#define TD_NOCENTER			256
-#define TD_NO_EXT			512	/* ext abused for particle key timing */
-#define TD_SKIP				1024 /* don't transform this data */
-
-/* transsnap->status */
-#define SNAP_ON			1
-#define TARGET_INIT		2
-#define POINT_INIT		4
-
-/* transsnap->modePoint */
-#define SNAP_GRID			0
-#define SNAP_GEO			1
-
-/* transsnap->modeTarget */
-#define SNAP_CLOSEST		0
-#define SNAP_CENTER			1
-#define SNAP_MEDIAN			2
-
-void checkFirstTime(void);
-
-void setTransformViewMatrices(TransInfo *t);
-void convertViewVec(TransInfo *t, float *vec, short dx, short dy);
-void projectIntView(TransInfo *t, float *vec, int *adr);
-void projectFloatView(TransInfo *t, float *vec, float *adr);
-
-void convertVecToDisplayNum(float *vec, float *num);
-void convertDisplayNumToVec(float *num, float *vec);
-
-void initWarp(TransInfo *t);
-int Warp(TransInfo *t, short mval[2]);
-
-void initShear(TransInfo *t);
-int handleEventShear(TransInfo *t, unsigned short evenl, short val);
-int Shear(TransInfo *t, short mval[2]);
-
-void initResize(TransInfo *t);
-int Resize(TransInfo *t, short mval[2]);
-
-void initTranslation(TransInfo *t);
-int Translation(TransInfo *t, short mval[2]);
-
-void initToSphere(TransInfo *t);
-int ToSphere(TransInfo *t, short mval[2]);
-
-void initRotation(TransInfo *t);
-int Rotation(TransInfo *t, short mval[2]);
-
-void initShrinkFatten(TransInfo *t);
-int ShrinkFatten(TransInfo *t, short mval[2]);
-
-void initTilt(TransInfo *t);
-int Tilt(TransInfo *t, short mval[2]);
-
-void initCurveShrinkFatten(TransInfo *t);
-int CurveShrinkFatten(TransInfo *t, short mval[2]);
-
-void initTrackball(TransInfo *t);
-int Trackball(TransInfo *t, short mval[2]);
-
-void initPushPull(TransInfo *t);
-int PushPull(TransInfo *t, short mval[2]);
-
-void initCrease(TransInfo *t);
-int Crease(TransInfo *t, short mval[2]);
-
-void initBoneSize(TransInfo *t);
-int BoneSize(TransInfo *t, short mval[2]);
-
-void initBoneEnvelope(TransInfo *t);
-int BoneEnvelope(TransInfo *t, short mval[2]);
-
-void initBoneRoll(TransInfo *t);
-int BoneRoll(TransInfo *t, short mval[2]);
-
-void initTimeTranslate(TransInfo *t);
-int TimeTranslate(TransInfo *t, short mval[2]);
-
-void initTimeSlide(TransInfo *t);
-int TimeSlide(TransInfo *t, short mval[2]);
-
-void initTimeScale(TransInfo *t);
-int TimeScale(TransInfo *t, short mval[2]);
-
-void initBakeTime(TransInfo *t);
-int BakeTime(TransInfo *t, short mval[2]);
-
-/*********************** transform_conversions.c ********** */
-struct ListBase;
-void flushTransIpoData(TransInfo *t);
-void flushTransUVs(TransInfo *t);
-void flushTransParticles(TransInfo *t);
-int clipUVTransform(TransInfo *t, float *vec, int resize);
-
-/*********************** exported from transform_manipulator.c ********** */
-void draw_manipulator_ext(struct ScrArea *sa, int type, char axis, int col, float vec[3], float mat[][3]);
-int calc_manipulator_stats(struct ScrArea *sa);
-float get_drawsize(struct View3D *v3d);
-
-/*********************** TransData Creation and General Handling *********** */
-void createTransData(TransInfo *t);
-void sort_trans_data_dist(TransInfo *t);
-void add_tdi_poin(float *poin, float *old, float delta);
-void special_aftertrans_update(TransInfo *t);
-
-/* auto-keying stuff used by special_aftertrans_update */
-void autokeyframe_ob_cb_func(struct Object *ob, int tmode);
-void autokeyframe_pose_cb_func(struct Object *ob, int tmode, short targetless_ik);
-
-/*********************** Constraints *****************************/
-
-void getConstraintMatrix(TransInfo *t);
-void setConstraint(TransInfo *t, float space[3][3], int mode, const char text[]);
-void setLocalConstraint(TransInfo *t, int mode, const char text[]);
-void setUserConstraint(TransInfo *t, int mode, const char text[]);
-
-void constraintNumInput(TransInfo *t, float vec[3]);
-
-void getConstraintMatrix(TransInfo *t);
-int isLockConstraint(TransInfo *t);
-int getConstraintSpaceDimension(TransInfo *t);
-char constraintModeToChar(TransInfo *t);
-
-void startConstraint(TransInfo *t);
-void stopConstraint(TransInfo *t);
-
-void initSelectConstraint(TransInfo *t, float mtx[3][3]);
-void selectConstraint(TransInfo *t);
-void postSelectConstraint(TransInfo *t);
-
-void setNearestAxis(TransInfo *t);
-
-/*********************** Snapping ********************************/
-
-typedef enum {
-	NO_GEARS 	= 0,
-	BIG_GEARS	= 1,
-	SMALL_GEARS	= 2
-} GearsType;
-
-void snapGrid(TransInfo *t, float *val);
-void snapGridAction(TransInfo *t, float *val, GearsType action);
-
-void initSnapping(struct TransInfo *t);
-void applySnapping(TransInfo *t, float *vec);
-void resetSnapping(TransInfo *t);
-int  handleSnapping(TransInfo *t, int event);
-void drawSnapping(TransInfo *t);
-
-/*********************** Generics ********************************/
-
-void initTrans(TransInfo *t);
-void initTransModeFlags(TransInfo *t, int mode);
-void postTrans (TransInfo *t);
-
-void drawLine(float *center, float *dir, char axis, short options);
-
-/* DRAWLINE options flags */
-#define DRAWLIGHT	1
-#define DRAWDASHED	2
-#define DRAWBOLD	4
-
-void applyTransObjects(TransInfo *t);
-void restoreTransObjects(TransInfo *t);
-void recalcData(TransInfo *t);
-
-void calculateCenter(TransInfo *t);
-void calculateCenter2D(TransInfo *t);
-void calculateCenterBound(TransInfo *t);
-void calculateCenterMedian(TransInfo *t);
-void calculateCenterCursor(TransInfo *t);
-
-void calculateCenterCursor2D(TransInfo *t);
-void calculatePropRatio(TransInfo *t);
-
-void getViewVector(float coord[3], float vec[3]);
-
-TransInfo * BIF_GetTransInfo(void);
-
-/*********************** NumInput ********************************/
-
-void outputNumInput(NumInput *n, char *str);
-short hasNumInput(NumInput *n);
-void applyNumInput(NumInput *n, float *vec);
-char handleNumInput(NumInput *n, unsigned short event);
-
-#endif
-
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index 3be5d900f0b..d6081df51b3 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf ../../windowmanager'
 incs += ' #/intern/guardedalloc'
 
 env.BlenderLib ( 'bf_editor_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
diff --git a/source/blender/ftfont/intern/FTF_Api.cpp b/source/blender/ftfont/intern/FTF_Api.cpp
index bf6698a1cde..e5f24736056 100644
--- a/source/blender/ftfont/intern/FTF_Api.cpp
+++ b/source/blender/ftfont/intern/FTF_Api.cpp
@@ -46,7 +46,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "datatoc.h"
+//XXX 	#include "datatoc.h"
 #ifdef __cplusplus
 }
 #endif
@@ -71,7 +71,7 @@ FTF_EXPORT int FTF_GetNewFont (const unsigned char *str, int datasize, int fonts
 	newfont= new FTF_TTFont(); 
 
 	if (!(newfont->SetFont((unsigned char*)str, datasize, fontsize))) {
-		newfont->SetFont((unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size, fontsize);
+		//XXX newfont->SetFont((unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size, fontsize);
 		return 0;
 	}
 	return 1;
diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h
index 88cc14551d8..b7f3f5b222d 100644
--- a/source/blender/nodes/intern/CMP_util.h
+++ b/source/blender/nodes/intern/CMP_util.h
@@ -80,8 +80,8 @@
 #include "RE_shader_ext.h"
 #include "RE_render_ext.h"
 
-#include "butspace.h"
-#include "mydevice.h"
+//XXX #include "butspace.h"
+//XXX #include "wm_event_types.h"
 
 /* *************************** operations support *************************** */
 
diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h
index e23d8cd6d41..fc74a6ccec7 100644
--- a/source/blender/nodes/intern/SHD_util.h
+++ b/source/blender/nodes/intern/SHD_util.h
@@ -74,8 +74,8 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
-#include "butspace.h"
-#include "mydevice.h"
+//XXX #include "butspace.h"
+//XXX #include "wm_event_types.h"
 
 
 /* ********* exec data struct, remains internal *********** */
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 7a3a24f0fe6..d8ad518da14 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -98,7 +98,7 @@
 #include "IMB_imbuf_types.h"
 
 #include "envmap.h"
-#include "multires.h"
+//XXX #include "multires.h"
 #include "render_types.h"
 #include "rendercore.h"
 #include "renderdatabase.h"
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index b3e710e456c..766e737fc33 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -76,7 +76,7 @@
 
 // XXX #include "BPY_extern.h"
 
-#include "datatoc.h"
+//XXX #include "datatoc.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -557,7 +557,7 @@ int WM_read_homefile(bContext *C, int from_memory)
 	if (!from_memory && BLI_exists(tstr)) {
 		success = BKE_read_file(C, tstr, NULL);
 	} else {
-		success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL);
+		//XXX success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL);
 		/* outliner patch for 2.42 .b.blend */
 		outliner_242_patch();
 	}
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 25d1e7c9c41..ccd1c645297 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -40,6 +40,9 @@
 /* custom data type */
 #define EVT_TABLET	1
 
+#define MOUSEX		0x004	
+#define MOUSEY		0x005	
+
 /* MOUSE : 0x00x */
 #define LEFTMOUSE		0x001	
 #define MIDDLEMOUSE		0x002	
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 721da902798..bc110dd01ec 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -63,10 +63,10 @@
 
 #include "RE_pipeline.h"
 
-#include "playanim_ext.h"
-#include "mydevice.h"
-#include "nla.h"
-#include "datatoc.h"
+//XXX #include "playanim_ext.h"
+#include "wm_event_types.h"
+//XXX #include "nla.h"
+//XXX #include "datatoc.h"
 
 #include "WM_api.h"
 
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
 	if(G.background) signal(SIGINT, blender_esc);	/* ctrl c out bg render */
 
 	/* background render uses this font too */
-	BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
+	//XXX BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
 	
 	init_def_material();
 
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 0c42a35c808..3064e09f12e 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -74,8 +74,8 @@
 #include "DNA_view3d_types.h"
 #include "DNA_screen_types.h"
 #include "BKE_global.h"
-#include "BIF_screen.h"
-#include "BIF_scrarea.h"
+//XXX #include "BIF_screen.h"
+//XXX #include "BIF_scrarea.h"
 
 #include "BKE_main.h"	
 #include "BLI_blenlib.h"
@@ -86,7 +86,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "BSE_headerbuttons.h"
+//XXX #include "BSE_headerbuttons.h"
 void update_for_newframe();
 #ifdef __cplusplus
 }
@@ -375,10 +375,10 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 					}
 					
 					// test for the ESC key
-					while (qtest())
+					while (0) //XXX while (qtest())
 					{
 						short val; 
-						unsigned short event = extern_qread(&val);
+						unsigned short event = 0; //XXX extern_qread(&val);
 						
 						if (keyboarddevice->ConvertBlenderEvent(event,val))
 							exitrequested = KX_EXIT_REQUEST_BLENDER_ESC;
@@ -387,9 +387,9 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 							* should this really be?
 						*/
 						if (event==MOUSEX) {
-							val = val - scrarea_get_win_x(area);
+							val = 0;//XXX val - scrarea_get_win_x(area);
 						} else if (event==MOUSEY) {
-							val = scrarea_get_win_height(area) - (val - scrarea_get_win_y(area)) - 1;
+							val = 0;//XXX scrarea_get_win_height(area) - (val - scrarea_get_win_y(area)) - 1;
 						}
 						
 						mousedevice->ConvertBlenderEvent(event,val);
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
index 03f78c4b145..5a155375ec1 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@@ -29,7 +29,7 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BIF_scrarea.h"
+//XXX #include "BIF_scrarea.h"
 #include "KX_BlenderCanvas.h"
 
 #ifdef HAVE_CONFIG_H
@@ -96,12 +96,12 @@ void KX_BlenderCanvas::ClearBuffer(int type)
 
 int KX_BlenderCanvas::GetWidth(
 ) const {
-	return scrarea_get_win_width(m_area);
+	return 0; //XXX scrarea_get_win_width(m_area);
 }
 
 int KX_BlenderCanvas::GetHeight(
 ) const {
-	return scrarea_get_win_height(m_area);
+	return 0; //XXX scrarea_get_win_height(m_area);
 }
 
 	void
@@ -112,8 +112,8 @@ SetViewPort(
 ){
 	int vp_width = (x2 - x1) + 1;
 	int vp_height = (y2 - y1) + 1;
-	int minx = scrarea_get_win_x(m_area);
-	int miny = scrarea_get_win_y(m_area);
+	int minx = 0;//XXX scrarea_get_win_x(m_area);
+	int miny = 0;//XXX scrarea_get_win_y(m_area);
 
 	glViewport(minx + x1, miny + y1, vp_width, vp_height);
 	glScissor(minx + x1, miny + y1, vp_width, vp_height);
@@ -150,9 +150,9 @@ void KX_BlenderCanvas::SetMouseState(RAS_MouseState mousestate)
 //	(0,0) is top left, (width,height) is bottom right
 void KX_BlenderCanvas::SetMousePosition(int x,int y)
 {
-	int winX = scrarea_get_win_x(m_area);
-	int winY = scrarea_get_win_y(m_area);
-	int winH = scrarea_get_win_height(m_area);
+	int winX = 0;//XXX scrarea_get_win_x(m_area);
+	int winY = 0;//XXX scrarea_get_win_y(m_area);
+	int winH = 0;//XXX scrarea_get_win_height(m_area);
 	
 	BL_warp_pointer(winX + x, winY + (winH-y-1));
 }
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index 413b16bc300..feea184e19d 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -82,10 +82,10 @@
 
 #include "BIF_gl.h"
 extern "C" {
-#include "BDR_drawmesh.h"
-#include "BIF_mywindow.h"
-#include "BIF_toolbox.h"
-#include "BIF_graphics.h" /* For CURSOR_NONE CURSOR_WAIT CURSOR_STD */
+//XXX #include "BDR_drawmesh.h"
+//XXX #include "BIF_mywindow.h"
+//XXX #include "BIF_toolbox.h"
+//XXX #include "BIF_graphics.h" /* For CURSOR_NONE CURSOR_WAIT CURSOR_STD */
 
 }
 
@@ -107,12 +107,12 @@ void spack(unsigned int ucol)
 
 void BL_warp_pointer(int x,int y)
 {
-	warp_pointer(x,y);
+	//XXX warp_pointer(x,y);
 }
 
 void BL_SwapBuffers()
 {
-	myswapbuffers();
+	//XXX myswapbuffers();
 }
 
 void BL_RenderText(int mode,const char* textstr,int textlen,struct MTFace* tface,
@@ -287,19 +287,19 @@ void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int
 
 void BL_HideMouse()
 {
-	set_cursor(CURSOR_NONE);
+	//XXX set_cursor(CURSOR_NONE);
 }
 
 
 void BL_WaitMouse()
 {
-	set_cursor(CURSOR_WAIT);
+	//XXX set_cursor(CURSOR_WAIT);
 }
 
 
 void BL_NormalMouse()
 {
-	set_cursor(CURSOR_STD);
+	//XXX set_cursor(CURSOR_STD);
 }
 #define MAX_FILE_LENGTH 512
 
@@ -312,9 +312,9 @@ void BL_MakeScreenShot(struct ScrArea *area, const char* filename)
 	// filename read - only
 	
 	  /* XXX will need to change at some point */
-	BIF_screendump(0);
+	//XXX BIF_screendump(0);
 
 	// write+read filename
-	write_screendump((char*) copyfilename);
+	//XXX write_screendump((char*) copyfilename);
 }
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
index ed4eb65a769..2737e87433b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
@@ -43,9 +43,15 @@
 #undef HKEY
 #endif
 
-#include "mydevice.h"
+#include "wm_event_types.h"
 #include "SCA_IInputDevice.h"
 
+/* timers */
+#define TIMER0		0x006	
+#define TIMER1		0x007	
+#define TIMER2		0x008	
+#define TIMER3		0x009	
+
 /**
  Base Class for Blender specific inputdevices. Blender specific inputdevices are used when the gameengine is running in embedded mode instead of standalone mode.
 */
diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile
index 036621fca74..275ddc2fbcc 100644
--- a/source/gameengine/BlenderRoutines/Makefile
+++ b/source/gameengine/BlenderRoutines/Makefile
@@ -50,6 +50,7 @@ CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/editors/include
 # because of kernel dependency on imbuf
+CPPFLAGS += -I../../blender/windowmanager
 CPPFLAGS += -I../../blender/imbuf
 CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/blenkernel
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index d795c21eb40..acc49e38da1 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -15,6 +15,7 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Bullet #source/gameengine/Physics/Sumo'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
 incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader'
+incs += ' #source/blender/windowmanager'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index fde54025fc7..630c958be8e 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -173,7 +173,7 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "BSE_headerbuttons.h"
+//XXX #include "BSE_headerbuttons.h"
 void update_for_newframe();
 //void scene_update_for_newframe(struct Scene *sce, unsigned int lay);
 //#include "BKE_ipo.h"
@@ -1692,7 +1692,7 @@ static struct Scene *GetSceneForName(struct Main *maggie, const STR_String& scen
 }
 
 #include "DNA_constraint_types.h"
-#include "BIF_editconstraint.h"
+//XXX #include "BIF_editconstraint.h"
 
 bPoseChannel *get_active_posechannel2 (Object *ob)
 {
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 804241ac9b9..1e1ce3095e0 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -86,8 +86,8 @@ extern "C"
 #include "DNA_curve_types.h"
 #include "BLI_blenlib.h"
 #include "MEM_guardedalloc.h"
-#include "BSE_editipo.h"
-#include "BSE_editipo_types.h"
+//XXX #include "BSE_editipo.h"
+//XXX #include "BSE_editipo_types.h"
 #include "DNA_ipo_types.h"
 #include "BKE_global.h"
 #include "DNA_space_types.h"
@@ -536,6 +536,7 @@ void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu ,struct SpaceI
 		return;
 
 	int i;
+#if 0 //XXX
 	EditIpo *ei= (EditIpo *)sipo->editipo;
 	if (!ei) return;
 
@@ -546,6 +547,7 @@ void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu ,struct SpaceI
 			return;
 		}
 	}
+#endif
 }
 
 //quick hack
@@ -796,7 +798,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = position.x();
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 							testhandles_ipocurve(icu1);
 #endif
@@ -805,7 +807,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = position.y();
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
 							testhandles_ipocurve(icu1);
@@ -815,7 +817,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = position.z();
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 							testhandles_ipocurve(icu1);
 #endif
@@ -824,7 +826,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = eulerAngles[0];
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
 							testhandles_ipocurve(icu1);
@@ -834,7 +836,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = eulerAngles[1];
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
 							testhandles_ipocurve(icu1);
@@ -844,7 +846,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 						if (icu1)
 						{
 							float curVal = eulerAngles[2];
-							insert_vert_icu(icu1, frameNumber, curVal, 0);
+							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 							
 							testhandles_ipocurve(icu1);
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 40c15302553..bf3dddbc2a7 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -39,6 +39,7 @@
 #pragma warning (disable : 4786)
 #endif //WIN32
 
+#include "wm_event_types.h"
 #include "KX_BlenderSceneConverter.h"
 #include "KX_ConvertSensors.h"
 
diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile
index f4604f19dcb..8d356554682 100644
--- a/source/gameengine/Converter/Makefile
+++ b/source/gameengine/Converter/Makefile
@@ -48,6 +48,7 @@ CPPFLAGS += -I$(NAN_BULLET2)/include
 
 CPPFLAGS += -I../../blender
 # these two needed because of blenkernel
+CPPFLAGS += -I../../blender/windowmanager
 CPPFLAGS += -I../../blender/imbuf
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/editors/include
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 9b6b0469313..7b35c551cf4 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -17,6 +17,7 @@ incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #s
 incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
 incs += ' #source/blender/misc #source/blender/blenloader'
+incs += ' #source/blender/windowmanager'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index c3aa83bec69..bbf5640f8e0 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -39,7 +39,7 @@
 #include "RAS_OpenGLRasterizer/ARB_multitexture.h"
 
 extern "C" {
-#include "BDR_drawmesh.h"
+//XXX #include "BDR_drawmesh.h"
 }
 
 #include "STR_HashedString.h"
@@ -180,7 +180,7 @@ void KX_BlenderMaterial::OnExit()
 	}
 
 	if( mMaterial->tface ) 
-		set_tpage(mMaterial->tface);
+		; //XXX set_tpage(mMaterial->tface);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
index 5a15a0375dc..0a4c7131c4e 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -39,7 +39,7 @@
 #include "BKE_image.h"
 
 extern "C" {
-#include "BDR_drawmesh.h"
+//XXX #include "BDR_drawmesh.h"
 }
 
 #include "DNA_material_types.h"
@@ -142,19 +142,19 @@ void KX_PolygonMaterial::DefaultActivate(RAS_IRasterizer* rasty, TCachingInfo& c
 	{
 		if (!cachingInfo)
 		{
-			set_tpage(NULL);
+			//XXX set_tpage(NULL);
 		}
 		cachingInfo = GetCachingInfo();
 
 		if ((m_drawingmode & 4)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
 		{
 			update_realtime_texture((struct MTFace*) m_tface, rasty->GetTime());
-			set_tpage(m_tface);
+			//XXX set_tpage(m_tface);
 			rasty->EnableTextures(true);
 		}
 		else
 		{
-			set_tpage(NULL);
+			//XXX set_tpage(NULL);
 			rasty->EnableTextures(false);
 		}
 		
@@ -400,7 +400,7 @@ KX_PYMETHODDEF_DOC(KX_PolygonMaterial, setTexture, "setTexture(tface)")
 	if (PyArg_ParseTuple(args, "O!", &PyCObject_Type, &pytface))
 	{
 		MTFace *tface = (MTFace*) PyCObject_AsVoidPtr(pytface);
-		set_tpage(tface);
+		//XXX set_tpage(tface);
 		Py_Return;
 	}