removed blenderdef.h, BIF_*, BDR_* and BSE_* header files (except for BIF_gl.h and BIF_glutil.h)

38 files changed, 115 insertions, 222 deletions

diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h
deleted file mode 100644
index d80d4ee5a17..00000000000
--- a/source/blender/blenkernel/BKE_bad_level_calls.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * blenlib/BKE_bad_level_calls.h (mar-2001 nzc)
- *	
- * Stuff that definitely does not belong in the kernel! These will all
- * have to be removed in order to restore sanity.
- *
- * $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 *****
- */
-#ifndef BKE_BAD_LEVEL_CALLS_H
-#define BKE_BAD_LEVEL_CALLS_H
-
-extern ListBase editNurb;
-
-#include "BIF_editmesh.h"
-#include "BIF_editmesh.h"
-#include "BIF_editfont.h"
-#include "BIF_editarmature.h"
-#include "BIF_toolbox.h"
-#include "BIF_interface.h"
-#include "BIF_screen.h"
-
-#include "BDR_editcurve.h"
-#include "BDR_vpaint.h"
-
-#include "BSE_sequence.h"
-
-#endif
-
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 69ff6876acd..90f22f96af7 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -41,6 +41,7 @@ struct AviCodecData;
 struct QuicktimeCodecData;
 
 /* sequence related defines */
+
 #define WHILE_SEQ(base)	{											\
 	int totseq_, seq_; Sequence **seqar;	\
 		build_seqar( base,  &seqar, &totseq_);	\
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 1eb7e232382..c3429ca12f4 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -68,8 +68,6 @@
 #include "BKE_particle.h"
 #include "BKE_utildefines.h"
 
-#include "BKE_bad_level_calls.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -98,8 +96,8 @@ void calc_curvepath(Object *ob)
 	
 	if(ob==NULL || ob->type != OB_CURVE) return;
 	cu= ob->data;
-	if(ob==G.obedit) nu= editNurb.first;
-	else nu= cu->nurb.first;
+	//XXX if(ob==G.obedit) nu= editNurb.first;
+	//XXX else nu= cu->nurb.first;
 	
 	if(cu->path) free_path(cu->path);
 	cu->path= NULL;
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 6bdb663545c..78e8253625d 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -65,7 +65,7 @@
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_editdeform.h"
+//XXX #include "BIF_editdeform.h"
 
 #include "IK_solver.h"
 
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index c87c75b0190..66c8f1531d1 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -69,8 +69,6 @@
 
 #include "BPY_extern.h"
 
-#include "blendef.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index a963b877912..662ab1dc19c 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -78,7 +78,6 @@
 #include "BKE_scene.h"
 
 #include "MEM_guardedalloc.h"
-#include "blendef.h"
 
 #include "BPY_extern.h"
 
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index a9b260536a2..2e686c46b0e 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -63,7 +63,6 @@
 #include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_displist.h"
@@ -1313,7 +1312,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender)
 	float (*deformedVerts)[3];
 		
 	if(!forRender && ob==G.obedit) {
-		nubase= &editNurb;
+		//XXX nubase= &editNurb;
 	}
 	else {
 		nubase= &cu->nurb;
@@ -1396,7 +1395,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
 		float (*originalVerts)[3];
 		float (*deformedVerts)[3];
 		int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE);
-		ListBase *nubase = obedit?&editNurb:&cu->nurb;
+		ListBase *nubase; //XXX ListBase *nubase = obedit?&editNurb:&cu->nurb;
 		int numVerts;
 
 		BLI_freelistN(&(cu->bev));
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index a6946081730..f649dc9690f 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -93,7 +93,7 @@
 #include <string.h>
 #endif // DISABLE_ELBEEM
 
-#include "BIF_screen.h"
+//XXX #include "BIF_screen.h"
 
 /* temporal struct, used for reading return of mesh_get_mapped_verts_nors() */
 
@@ -1918,7 +1918,7 @@ void build_particle_system(Object *ob)
 		if(waitcursor_set==0 && (a % 256)==255) {
 			double seconds= PIL_check_seconds_timer();
 			if(seconds - startseconds > 0.5) {
-				waitcursor(1);
+				//XXX waitcursor(1);
 				waitcursor_set= 1;
 			}
 		}
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 3b6aa3bc1eb..24c84a6d5ec 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -99,7 +99,6 @@
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
@@ -122,8 +121,6 @@
 
 #include "BPY_extern.h"
 
-#include "blendef.h"
-
 #include "zlib.h"
 
 static int is_dxf(char *str);
@@ -178,7 +175,6 @@ static int is_stl(char *str)
     MEM_freeN(facedata);                                \
     fclose(fpSTL);                                      \
     sprintf(error_msg, "Problems reading face %d!", i); \
-    error(error_msg);                                   \
     return;                                             \
   }                                                     \
   else {                                                \
@@ -245,7 +241,7 @@ static void read_stl_mesh_binary(char *str)
 
 	fpSTL= fopen(str, "rb");
 	if(fpSTL==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 
@@ -306,7 +302,7 @@ static void read_stl_mesh_binary(char *str)
 			mesh_add_normals_flags(me);
 			make_edges(me, 0);
 		}
-		waitcursor(1);
+		//XXX waitcursor(1);
 	}
 	fclose(fpSTL);
 
@@ -318,7 +314,6 @@ static void read_stl_mesh_binary(char *str)
 	fclose(fpSTL); \
 	sprintf(error_msg, "Can't allocate storage for %d faces!", \
 			numtenthousand * 10000); \
-	error(error_msg); \
 	return; \
 }
 
@@ -327,7 +322,6 @@ static void read_stl_mesh_binary(char *str)
 	fclose(fpSTL); \
 	free(vertdata); \
 	sprintf(error_msg, "Line %d: %s", linenum, message); \
-	error(message); \
 	return; \
 }
 
@@ -363,7 +357,7 @@ static void read_stl_mesh_ascii(char *str)
 
 	fpSTL= fopen(str, "r");
 	if(fpSTL==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 	
@@ -373,7 +367,7 @@ static void read_stl_mesh_ascii(char *str)
 	 */
 	numtenthousand = 1;
 	vertdata = malloc(numtenthousand*3*30000*sizeof(float));	// uses realloc!
-	if (!vertdata) STLALLOCERROR;
+	if (!vertdata); STLALLOCERROR;
 
 	linenum = 1;
 	/* Get rid of the first line */
@@ -396,7 +390,7 @@ static void read_stl_mesh_ascii(char *str)
 			++numtenthousand;
 			vertdata = realloc(vertdata, 
 							   numtenthousand*3*30000*sizeof(float));
-			if (!vertdata) STLALLOCERROR;
+			if (!vertdata); STLALLOCERROR;
 		}
 		
 		/* Don't read normal, but check line for proper syntax anyway
@@ -474,7 +468,7 @@ static void read_stl_mesh_ascii(char *str)
 	mesh_add_normals_flags(me);
 	make_edges(me, 0);
 
-	waitcursor(1);
+	//XXX waitcursor(1);
 }
 
 #undef STLALLOCERROR
@@ -498,7 +492,7 @@ static void read_videoscape_mesh(char *str)
 	
 	fp= fopen(str, "rb");
 	if(fp==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 	
@@ -507,12 +501,12 @@ static void read_videoscape_mesh(char *str)
 	fscanf(fp, "%d\n", &verts);
 	if(verts<=0) {
 		fclose(fp);
-		error("Read error");
+		//XXX error("Read error");
 		return;
 	}
 	
 	if(verts>MESH_MAX_VERTS) {
-		error("too many vertices");
+		//XXX error("too many vertices");
 		fclose(fp);
 		return;
 	}
@@ -686,7 +680,7 @@ static void read_videoscape_mesh(char *str)
 	mesh_add_normals_flags(me);
 	make_edges(me, 0);
 
-	waitcursor(1);
+	//XXX waitcursor(1);
 }
 
 static void read_radiogour(char *str)
@@ -704,7 +698,7 @@ static void read_radiogour(char *str)
 	
 	fp= fopen(str, "rb");
 	if(fp==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 	
@@ -713,12 +707,12 @@ static void read_radiogour(char *str)
 	fscanf(fp, "%d\n", &verts);
 	if(verts<=0) {
 		fclose(fp);
-		error("Read error");
+		//XXX error("Read error");
 		return;
 	}
 	
 	if(verts>MESH_MAX_VERTS) {
-		error("too many vertices");
+		//XXX error("too many vertices");
 		fclose(fp);
 		return;
 	}
@@ -754,7 +748,7 @@ static void read_radiogour(char *str)
 	
 	if(totedge+tottria+totquad>MESH_MAX_VERTS) {
 		printf(" var1: %d, var2: %d, var3: %d \n", totedge, tottria, totquad);
-		error("too many faces");
+		//XXX error("too many faces");
 		MEM_freeN(vertdata);
 		MEM_freeN(colvertdata);
 		fclose(fp);
@@ -869,7 +863,7 @@ static void read_radiogour(char *str)
 	mesh_add_normals_flags(me);
 	make_edges(me, 0);
 
-	waitcursor(1);
+	//XXX waitcursor(1);
 }
 
 
@@ -884,7 +878,7 @@ static void read_videoscape_lamp(char *str)
 	
 	fp= fopen(str, "rb");
 	if(fp==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 
@@ -929,7 +923,7 @@ static void read_videoscape_nurbs(char *str)
 
 	fp= fopen(str, "rb");
 	if(fp==NULL) {
-		error("Can't read file");
+		//XXX error("Can't read file");
 		return;
 	}
 
@@ -1243,7 +1237,7 @@ static void read_inventor(char *str, struct ListBase *listb)
 	
 	file= open(str, O_BINARY|O_RDONLY);
 	if(file== -1) {
-		error("Can't read file\n");
+		//XXX error("Can't read file\n");
 		return;
 	}
 
@@ -2018,7 +2012,7 @@ static void displist_to_mesh(DispList *dlfirst)
 	}
 	
 	if(totcol>16) {
-		error("Found more than 16 different colors");
+		//XXX error("Found more than 16 different colors");
 		totcol= 16;
 	}
 
@@ -2291,7 +2285,7 @@ static void displist_to_objects(ListBase *lbase)
 
 	if(totvert==0) {
 		
-		if(ivsurf==0) error("Found no data");
+		if(ivsurf==0) ; //XXX error("Found no data");
 		if(lbase->first) BLI_freelistN(lbase);
 		
 		return;
@@ -2377,7 +2371,7 @@ int BKE_read_exotic(char *name)
 		gzfile = gzopen(name,"rb");
 
 		if (NULL == gzfile ) {
-			error("Can't open file: %s", name);
+			//XXX error("Can't open file: %s", name);
 			retval= -1;
 		} else {
 			gzread(gzfile, str, 31);
@@ -2385,11 +2379,11 @@ int BKE_read_exotic(char *name)
 
 			if ((*s0 != FORM) && (strncmp(str, "BLEN", 4) != 0) && !BLI_testextensie(name,".blend.gz")) {
 
-				waitcursor(1);
+				//XXX waitcursor(1);
 				
 				if(*s0==GOUR) {
 					if(G.obedit) {
-						error("Unable to perform function in EditMode");
+						//XXX error("Unable to perform function in EditMode");
 					} else {
 						read_radiogour(name);
 						retval = 1;
@@ -2397,7 +2391,7 @@ int BKE_read_exotic(char *name)
 				}
 				else if ELEM4(*s0, DDG1, DDG2, DDG3, DDG4) {
 					if(G.obedit) {
-						error("Unable to perform function in EditMode");
+						//XXX error("Unable to perform function in EditMode");
 					} else {
 						read_videoscape(name);
 						retval = 1;
@@ -2409,7 +2403,7 @@ int BKE_read_exotic(char *name)
 						displist_to_objects(&lbase);				
 						retval = 1;
 					} else {
-						error("Can only read Inventor 1.0 ascii");
+						//XXX error("Can only read Inventor 1.0 ascii");
 					}
 				}
 				else if((strncmp(str, "#VRML V1.0 asc", 14)==0)) {
@@ -2433,11 +2427,11 @@ int BKE_read_exotic(char *name)
 					if (BPY_call_importloader(name)) {
 						retval = 1;
 					} else {	
-						error("Unknown file type or error, check console");
+						//XXX error("Unknown file type or error, check console");
 					}	
 				
 				}
-				waitcursor(0);
+				//XXX waitcursor(0);
 			}
 		}
 	}
@@ -2521,19 +2515,19 @@ void write_stl(char *str)
 
 	if (!during_script()) {
 		if (BLI_exists(str))
-			if(saveover(str)==0)
-				return;
+			; //XXX if(saveover(str)==0)
+			//XXX	return;
 	}
 
 	fpSTL= fopen(str, "wb");
 	
 	if(fpSTL==NULL) {
-		if (!during_script()) error("Can't write file");
+		if (!during_script()) ; //XXX error("Can't write file");
 		return;
 	}
 	strcpy(temp_dir, str);
 	
-	waitcursor(1);
+	//XXX waitcursor(1);
 	
 	/* The header part of the STL */
 	/* First 80 characters are a title or whatever you want.
@@ -2570,7 +2564,7 @@ void write_stl(char *str)
 
 	fclose(fpSTL);
 	
-	waitcursor(0);
+	//XXX waitcursor(0);
 }
 
 static void write_videoscape_mesh(Object *ob, char *str)
@@ -2695,7 +2689,8 @@ void write_videoscape(char *str)
 
 	file= open(str,O_BINARY|O_RDONLY);
 	close(file);
-	if(file>-1) if(!during_script() && saveover(str)==0) return;
+	//XXX saveover()
+	// if(file>-1) if(!during_script() && saveover(str)==0) return;
 
 	strcpy(temp_dir, str);
 
@@ -3010,18 +3005,17 @@ void write_vrml(char *str)
 	if(BLI_testextensie(str,".blend")) str[ strlen(str)-6]= 0;
 	if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0;
 	if(BLI_testextensie(str,".wrl")==0) strcat(str, ".wrl");
-
-	if(!during_script() && saveover(str)==0) return;
+	//XXX saveover()       if(!during_script() && saveover(str)==0) return;
 	
 	fp= fopen(str, "w");
 	
 	if(fp==NULL && !during_script()) {
-		error("Can't write file");
+		//XXX error("Can't write file");
 		return;
 	}
 	strcpy(temp_dir, str);
 
-	waitcursor(1);
+	//XXX waitcursor(1);
 	
 	/* FIRST: write all the datablocks */
 	
@@ -3089,7 +3083,7 @@ void write_vrml(char *str)
 	
 	fclose(fp);
 	
-	waitcursor(0);
+	//XXX waitcursor(0);
 }
 
 
@@ -3324,19 +3318,19 @@ void write_dxf(char *str)
 
 	if (!during_script()) {
 		if (BLI_exists(str))
-			if(saveover(str)==0)
-				return;
+			; //XXX if(saveover(str)==0)
+			//	return;
 	}
 
 	fp= fopen(str, "w");
 	
 	if(fp==NULL && !during_script()) {
-		error("Can't write file");
+		//XXX error("Can't write file");
 		return;
 	}
 	strcpy(temp_dir, str);
 	
-	waitcursor(1);
+	//XXX waitcursor(1);
 	
 	/* The header part of the DXF */
 	
@@ -3389,7 +3383,7 @@ void write_dxf(char *str)
 	write_group(0, "EOF");
 	fclose(fp);
 	
-	waitcursor(0);
+	//XXX waitcursor(0);
 }
 
 
@@ -3516,13 +3510,14 @@ static int read_groupf(char *str)
 	return ret;
 }
 
-#define id_test(id) if(id<0) {char errmsg[128];fclose(dxf_fp); if(id==-1) sprintf(errmsg, "Error inputting dxf, near line %d", dxf_line); else if(id==-2) sprintf(errmsg, "Error reading dxf, near line %d", dxf_line);error(errmsg); return;}
+//XXX error() is now printf until we have a callback error
+#define id_test(id) if(id<0) {char errmsg[128];fclose(dxf_fp); if(id==-1) sprintf(errmsg, "Error inputting dxf, near line %d", dxf_line); else if(id==-2) sprintf(errmsg, "Error reading dxf, near line %d", dxf_line);printf(errmsg); return;}
 
 #define read_group(id,str) {id= read_groupf(str); id_test(id);}
 
 #define group_is(idtst,str) (id==idtst&&strcmp(val,str)==0)
 #define group_isnt(idtst,str) (id!=idtst||strcmp(val,str)!=0)
-#define id_check(idtst,str) if(group_isnt(idtst,str)) { fclose(dxf_fp); error("Error parsing dxf, near line %d", dxf_line); return;}
+#define id_check(idtst,str) if(group_isnt(idtst,str)) { fclose(dxf_fp); printf("Error parsing dxf, near line %d", dxf_line); return;}
 
 static int id;
 static char val[256];
@@ -4335,7 +4330,7 @@ static void dxf_read_polyline(int noob) {
 	
 			} else if (vflags & 128) {
 				if(vids[2]==0) {
-					error("(PL) Error parsing dxf, not enough vertices near line %d", dxf_line);
+					//XXX error("(PL) Error parsing dxf, not enough vertices near line %d", dxf_line);
 			
 					error_exit=1;
 					fclose(dxf_fp);
@@ -4367,7 +4362,7 @@ static void dxf_read_polyline(int noob) {
 				mface->mat_nr= 0;
 	
 			} else {
-				error("Error parsing dxf, unknown polyline information near %d", dxf_line);
+				//XXX error("Error parsing dxf, unknown polyline information near %d", dxf_line);
 			
 				error_exit=1;
 				fclose(dxf_fp);
@@ -4447,14 +4442,14 @@ static void dxf_read_lwpolyline(int noob) {
 		if (id == 10) {
 			vert[0]= (float) atof(val);
 		} else {
-			error("Error parsing dxf, expected (10, <x>) at line %d", dxf_line);	
+			//XXX error("Error parsing dxf, expected (10, <x>) at line %d", dxf_line);	
 		}
 
 		read_group(id,val);
 		if (id == 20) {
 			vert[1]= (float) atof(val);
 		} else {
-			error("Error parsing dxf, expected (20, <y>) at line %d", dxf_line);	
+			//XXX error("Error parsing dxf, expected (20, <y>) at line %d", dxf_line);	
 		}
 		
 		mvert = &me->mvert[v];
@@ -4590,7 +4585,7 @@ static void dxf_read_3dface(int noob)
 		dxf_close_3dface();
 	
 	if(nverts<3) {
-		error("(3DF) Error parsing dxf, not enough vertices near line %d", dxf_line);
+		//XXX error("(3DF) Error parsing dxf, not enough vertices near line %d", dxf_line);
 		
 		error_exit=1;
 		fclose(dxf_fp);
@@ -4703,7 +4698,7 @@ static void dxf_read(char *filename)
 						} else if (id==3) {
 							/* Now the object def should follow */
 							if(strlen(entname)==0) {
-								error("Error parsing dxf, no mesh name near %d", dxf_line);
+								//XXX error("Error parsing dxf, no mesh name near %d", dxf_line);
 								fclose(dxf_fp);
 								return;
 							}
@@ -4813,7 +4808,7 @@ static void dxf_read(char *filename)
 					}
 			
 					if(strlen(obname)==0) {
-						error("Error parsing dxf, no object name near %d", dxf_line);
+						//XXX error("Error parsing dxf, no object name near %d", dxf_line);
 						fclose(dxf_fp);
 						return;
 					}
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 2a2547fd839..7891dde3b3c 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -56,7 +56,6 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_utildefines.h"
-#include "BKE_bad_level_calls.h"
 
 #include "BKE_packedFile.h"
 
@@ -385,8 +384,6 @@ VFont *load_vfont(char *name)
 
 	if (pf) {
 		VFontData *vfd;
-		
-		waitcursor(1);
 
 #ifdef WITH_FREETYPE2
 		vfd= BLI_vfontdata_from_freetypefont(pf);
@@ -420,7 +417,7 @@ VFont *load_vfont(char *name)
 			freePackedFile(pf);
 		}
 	
-		waitcursor(0);
+		//XXX waitcursor(0);
 	}
 	
 	return vfont;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 6b0586ab62c..a79433fcfa1 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -72,7 +72,7 @@
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_editseq.h"
+//XXX #include "BIF_editseq.h"
 
 #include "PIL_time.h"
 
@@ -81,8 +81,6 @@
 /* for stamp drawing to an image */
 #include "BMF_Api.h"
 
-#include "BDR_drawmesh.h"
-
 /* max int, to indicate we don't store sequences in ibuf */
 #define IMA_NO_INDEX	0x7FEFEFEF
 
@@ -217,7 +215,7 @@ static void image_free_buffers(Image *ima)
 		ima->rr= NULL;
 	}	
 	
-	free_realtime_image(ima);
+	//XXX free_realtime_image(ima);
 	
 	ima->ok= IMA_OK;
 }
@@ -553,7 +551,7 @@ void free_old_images()
 			   This gives textures a "second chance" to be used before dying.
 			*/
 			if(ima->bindcode || ima->repbind) {
-				free_realtime_image(ima);
+				//XXX free_realtime_image(ima);
 				ima->lastused = ctime;
 			}
 			/* Otherwise, just kill the buffers */
@@ -893,7 +891,7 @@ static void stampdata(StampData *stamp_data, int do_prefix)
 	}
 	
 	if (G.scene->r.stamp & R_STAMP_SEQSTRIP) {
-		Sequence *seq = get_forground_frame_seq(G.scene->r.cfra);
+		Sequence *seq; //XXX = get_forground_frame_seq(G.scene->r.cfra);
 	
 		if (seq) strcpy(text, seq->name+2);
 		else 		strcpy(text, "<none>");
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 4af310913d6..2b68d26994f 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -63,7 +63,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 
 #include "BKE_action.h"
@@ -2140,7 +2139,7 @@ void do_ob_ipo(Object *ob)
 	if(ob->id.name[2]=='S' && ob->id.name[3]=='C' && ob->id.name[4]=='E') {
 		if(strcmp(G.scene->id.name+2, ob->id.name+6)==0) {
 			G.scene->lay= ob->lay;
-			copy_view3d_lock(0);
+			//XXX copy_view3d_lock(0);
 			/* no redraw here! creates too many calls */
 		}
 	}
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index b57b799001a..4a62c64f48a 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -48,7 +48,6 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_action.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_blender.h"
 #include "BKE_curve.h"
 #include "BKE_global.h"
@@ -63,8 +62,6 @@
 
 #include "BLI_blenlib.h"
 
-#include "blendef.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 2b815c28cc5..8f98b96d0f4 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -73,14 +73,12 @@
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_editdeform.h"
+//XXX #include "BIF_editdeform.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include "blendef.h"
-
 Lattice *editLatt=0;
 static Lattice *deformLatt=0;
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 54575aeae7d..5976f7846f2 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -84,7 +84,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_global.h"
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 42cac46c241..2b94ea0b09c 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -50,7 +50,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"		
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_blender.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
@@ -842,7 +841,7 @@ void delete_material_index()
 	int a, actcol;
 	
 	if(G.obedit) {
-		error("Unable to perform function in EditMode");
+		//XXX error("Unable to perform function in EditMode");
 		return;
 	}
 	ob= ((G.scene->basact)? (G.scene->basact->object) : 0) ;
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 420fea0a66d..3933e2bfaa0 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -53,7 +53,6 @@
 #include "BLI_arithb.h"
 
 #include "BKE_utildefines.h"
-#include "BKE_bad_level_calls.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 25a391be566..32e4d5cc1b0 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -72,7 +72,6 @@
 /* -- */
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
-#include "BKE_bad_level_calls.h"
 
 #ifdef WITH_VERSE
 #include "BKE_verse.h"
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index d609b231905..811b6d39f47 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -73,7 +73,6 @@
 
 #include "BKE_main.h"
 #include "BKE_anim.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_global.h"
@@ -101,7 +100,7 @@
 
 #include "RE_shader_ext.h"
 
-#include "BIF_meshlaplacian.h"
+//XXX #include "BIF_meshlaplacian.h"
 
 /***/
 
diff --git a/source/blender/blenkernel/intern/multires-firstlevel.c b/source/blender/blenkernel/intern/multires-firstlevel.c
index a276266d34f..b27d1c4b156 100644
--- a/source/blender/blenkernel/intern/multires-firstlevel.c
+++ b/source/blender/blenkernel/intern/multires-firstlevel.c
@@ -38,7 +38,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BIF_editmesh.h"
+//XXX #include "BIF_editmesh.h"
 
 #include "BKE_customdata.h"
 #include "BKE_global.h"
@@ -49,8 +49,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "blendef.h"
-
 #include <string.h>
 
 MDeformVert *subdivide_dverts(MDeformVert *src, MultiresLevel *lvl);
@@ -388,7 +386,7 @@ void multires_delete_layer(Mesh *me, CustomData *cd, const int type, int n)
 		CustomData_set_layer_active(cd, type, n);
 		CustomData_free_layer_active(cd, type, lvl1->totface);
 		
-		multires_level_to_mesh(OBACT, me, 0);
+		multires_level_to_mesh((G.scene->basact)->object, me, 0);
 	}
 }
 
@@ -404,6 +402,6 @@ void multires_add_layer(Mesh *me, CustomData *cd, const int type, const int n)
 			CustomData_add_layer(cd, type, CD_DEFAULT, NULL, current_level(me->mr)->totface);
 
 		CustomData_set_layer_active(cd, type, n);
-		multires_level_to_mesh(OBACT, me, 0);
+		multires_level_to_mesh((G.scene->basact)->object, me, 0);
 	}
 }
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 0874890a2c6..b57a5f465c0 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -35,8 +35,6 @@
 #include "DNA_object_types.h"
 #include "DNA_vec_types.h"
 
-#include "BIF_editmesh.h"
-
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
@@ -46,7 +44,6 @@
 #include "BKE_global.h"
 #include "BKE_multires.h"
 
-#include "blendef.h"
 #include "editmesh.h"
 
 #include <math.h>
@@ -188,7 +185,7 @@ void eed_to_medge_flag(EditEdge *eed, short *flag, char *crease)
 	if(eed->f2==0) *flag |= ME_LOOSEEDGE;
 	if(eed->sharp) *flag |= ME_SHARP;
 	if(eed->seam) *flag |= ME_SEAM;
-	if(eed->h & EM_FGON) *flag |= ME_FGON;
+	//XXX if(eed->h & EM_FGON) *flag |= ME_FGON;
 	if(eed->h & 1) *flag |= ME_HIDE;
 	
 	*crease= (char)(255.0*eed->crease);
@@ -218,7 +215,7 @@ static void multires_get_face(MultiresFace *f, EditFace *efa, MFace *m)
 		tmp.v3= efa->v3->tmp.l;
 		tmp.v4= 0;
 		if(efa->v4) tmp.v4= efa->v4->tmp.l;
-		test_index_face(&tmp, NULL, 0, efa->v4?4:3);
+		//XXX test_index_face(&tmp, NULL, 0, efa->v4?4:3);
 		for(j=0; j<4; ++j) f->v[j]= (&tmp.v1)[j];
 
 		/* Flags */
@@ -357,7 +354,7 @@ void multires_create(Object *ob, Mesh *me)
 	
 	lvl= MEM_callocN(sizeof(MultiresLevel), "multires level");
 
-	if(me->pv) mesh_pmv_off(ob, me);
+	//XXX if(me->pv) mesh_pmv_off(ob, me);
 
 	me->mr= MEM_callocN(sizeof(Multires), "multires data");
 	
@@ -1033,7 +1030,7 @@ void multires_level_to_mesh(Object *ob, Mesh *me, const int render)
 	CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert);
 	CustomData_add_layer(&me->edata, CD_MEDGE, CD_CALLOC, NULL, me->totedge);
 	CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface);
-	mesh_update_customdata_pointers(me);
+	//XXX mesh_update_customdata_pointers(me);
 
 	/* Vertices/Edges/Faces */
 	
@@ -1088,11 +1085,11 @@ void multires_level_to_mesh(Object *ob, Mesh *me, const int render)
 			
 	}
 	
-	mesh_update_customdata_pointers(me);
+	//XXX mesh_update_customdata_pointers(me);
 	
 	multires_edge_level_update(ob,me);
 	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
+	//XXX mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
 }
 
 void multires_add_level(Object *ob, Mesh *me, const char subdiv_type)
@@ -1103,7 +1100,7 @@ void multires_add_level(Object *ob, Mesh *me, const char subdiv_type)
 	MVert *oldverts= NULL;
 	
 	lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel");
-	if(me->pv) mesh_pmv_off(ob, me);
+	//XXX if(me->pv) mesh_pmv_off(ob, me);
 
 	check_colors(me);
 	multires_update_levels(me, 0);
@@ -1269,7 +1266,7 @@ void multires_add_level(Object *ob, Mesh *me, const char subdiv_type)
 
 void multires_set_level(Object *ob, Mesh *me, const int render)
 {
-	if(me->pv) mesh_pmv_off(ob, me);
+	//XXX if(me->pv) mesh_pmv_off(ob, me);
 
 	check_colors(me);
 	multires_update_levels(me, render);
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d48be54fe10..e6750c02c2e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -81,7 +81,6 @@
 #include "BLI_editVert.h"
 
 #include "BKE_utildefines.h"
-#include "BKE_bad_level_calls.h"
 
 #include "BKE_main.h"
 #include "BKE_global.h"
@@ -1583,7 +1582,7 @@ static void give_parvert(Object *par, int nr, float *vec)
 		
 		cu= par->data;
 		nu= cu->nurb.first;
-		if(par==G.obedit) nu= editNurb.first;
+		//XXX if(par==G.obedit) nu= editNurb.first;
 		
 		count= 0;
 		while(nu) {
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index bd33fafe23c..a00828ed568 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -64,7 +64,6 @@
 #include "BKE_image.h"
 #include "BKE_font.h"
 #include "BKE_packedFile.h"
-#include "BKE_bad_level_calls.h" /* <- waitcursor */
 
 int seekPackedFile(PackedFile * pf, int offset, int whence)
 {
@@ -183,7 +182,7 @@ PackedFile * newPackedFile(char * filename)
 	char name[FILE_MAXDIR+FILE_MAXFILE];
 	void * data;
 	
-	waitcursor(1);
+	//XXX waitcursor(1);
 	
 	// convert relative filenames to absolute filenames
 	
@@ -213,7 +212,7 @@ PackedFile * newPackedFile(char * filename)
 		close(file);
 	}
 
-	waitcursor(0);
+	//XXX waitcursor(0);
 		
 	return (pf);
 }
@@ -286,7 +285,7 @@ int writePackedFile(char * filename, PackedFile *pf, int guimode)
 	char tempname[FILE_MAXDIR + FILE_MAXFILE];
 /*  	void * data; */
 	
-	if (guimode) waitcursor(1);
+	if (guimode); //XXX  waitcursor(1);
 	
 	strcpy(name, filename);
 	BLI_convertstringcode(name, G.sce, G.scene->r.cfra);
@@ -309,28 +308,28 @@ int writePackedFile(char * filename, PackedFile *pf, int guimode)
 	file = open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
 	if (file >= 0) {
 		if (write(file, pf->data, pf->size) != pf->size) {
-			if(guimode) error("Error writing file: %s", name);
+			if(guimode) ; //XXX error("Error writing file: %s", name);
 			ret_value = RET_ERROR;
 		}
 		close(file);
 	} else {
-		if(guimode) error("Error creating file: %s", name);
+		if(guimode); //XXX error("Error creating file: %s", name);
 		ret_value = RET_ERROR;
 	}
 	
 	if (remove_tmp) {
 		if (ret_value == RET_ERROR) {
 			if (BLI_rename(tempname, name) == RET_ERROR) {
-				if(guimode) error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name);
+				if(guimode); //XXX error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name);
 			}
 		} else {
 			if (BLI_delete(tempname, 0, 0) == RET_ERROR) {
-				if(guimode) error("Error deleting '%s' (ignored)");
+				if(guimode); //XXX error("Error deleting '%s' (ignored)");
 			}
 		}
 	}
 	
-	if(guimode) waitcursor(0);
+	if(guimode); //XXX waitcursor(0);
 
 	return (ret_value);
 }
@@ -453,7 +452,7 @@ char *unpackFile(char * abs_name, char * local_name, PackedFile * pf, int how)
 					break;
 			}
 			
-			how = pupmenu(menu);
+			//XXX how = pupmenu(menu);
 		}
 		
 		switch (how) {
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index f6b4ba48b26..c77fcc7c0e8 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -74,13 +74,10 @@
 #include "BKE_key.h"
 #include "BKE_library.h"
 #include "BKE_depsgraph.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h"
 
-#include "blendef.h"
-#include "BIF_editparticle.h"
 #include "RE_render_ext.h"
 
 static void key_from_object(Object *ob, ParticleKey *key);
@@ -248,7 +245,7 @@ int psys_ob_has_hair(Object *ob)
 }
 int psys_in_edit_mode(ParticleSystem *psys)
 {
-	return ((G.f & G_PARTICLEEDIT) && psys==psys_get_current(OBACT) && psys->edit);
+	return ((G.f & G_PARTICLEEDIT) && psys==psys_get_current((G.scene->basact)->object) && psys->edit);
 }
 int psys_check_enabled(Object *ob, ParticleSystem *psys)
 {
@@ -332,7 +329,7 @@ void psys_free(Object *ob, ParticleSystem * psys)
 
 		free_keyed_keys(psys);
 
-		PE_free_particle_edit(psys);
+		//XXX PE_free_particle_edit(psys);
 
 		if(psys->particles){
 			MEM_freeN(psys->particles);
@@ -2245,7 +2242,7 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda
 		
 		//timed = edit->draw_timed;
 
-		PE_get_colors(sel,nosel);
+		//XXX PE_get_colors(sel,nosel);
 		if(pset->brushtype == PE_BRUSH_WEIGHT){
 			sel_col[0] = sel_col[1] = sel_col[2] = 1.0f;
 			nosel_col[0] = nosel_col[1] = nosel_col[2] = 0.0f;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 81203ad7176..5b56216f08e 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4252,7 +4252,7 @@ static void hair_step(Object *ob, ParticleSystemModifierData *psmd, ParticleSyst
 		precalc_effectors(ob,psys,psmd);
 		
 	if(psys_in_edit_mode(psys))
-		PE_recalc_world_cos(ob, psys);
+		; //XXX PE_recalc_world_cos(ob, psys);
 
 	psys_update_path_cache(ob,psmd,psys,cfra);
 }
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 2afcf19427c..206c1f8fc15 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -42,7 +42,6 @@
 
 #include "BLI_blenlib.h"
 #include "BKE_utildefines.h"
-#include "blendef.h"
 
 /* needed for directory lookup */
 #ifndef WIN32
diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c
index a60c03c4840..30b9cf91624 100644
--- a/source/blender/blenkernel/intern/property.c
+++ b/source/blender/blenkernel/intern/property.c
@@ -47,9 +47,7 @@
 #include "DNA_object_types.h"
 #include "DNA_listBase.h"
 
-
 #include "BLI_blenlib.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_property.h"
 
 void free_property(bProperty *prop)
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index 6f372bfb45d..fce43aba6bc 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -47,7 +47,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 47640ad07ae..b19e2f4f0be 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -63,7 +63,6 @@
 #include "BKE_action.h"			
 #include "BKE_anim.h"
 #include "BKE_armature.h"		
-#include "BKE_bad_level_calls.h"
 #include "BKE_colortools.h"
 #include "BKE_constraint.h"
 #include "BKE_depsgraph.h"
@@ -81,7 +80,7 @@
 #include "BKE_world.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_previewrender.h"
+//XXX #include "BIF_previewrender.h"
 
 #include "BPY_extern.h"
 #include "BLI_arithb.h"
@@ -136,7 +135,7 @@ void free_scene(Scene *sce)
 	/* do not free objects! */
 
 	BLI_freelistN(&sce->base);
-	free_editing(sce->ed);
+	//XXX free_editing(sce->ed);
 	if(sce->radio) MEM_freeN(sce->radio);
 	sce->radio= 0;
 	
@@ -349,7 +348,7 @@ void set_scene_name(char *name)
 		}
 	}
 	
-	error("Can't find scene: %s", name);
+	//XXX error("Can't find scene: %s", name);
 }
 
 /* used by metaballs
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index c2035a19384..b41fdbba5e4 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -34,7 +34,6 @@
 #include <math.h>
 
 #include "DNA_screen_types.h"
-#include "BKE_bad_level_calls.h"
 #include "BLI_blenlib.h"
 
 #include "BKE_screen.h"
@@ -46,7 +45,7 @@
 /* don't free screen itself */
 void free_screen(bScreen *sc)
 {
-	unlink_screen(sc); /* bad level call */
+	//XXX unlink_screen(sc); /* bad level call */
 
 	BLI_freelistN(&sc->vertbase);
 	BLI_freelistN(&sc->edgebase);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index bd9d1cb75ca..224da56a047 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -84,8 +84,8 @@ variables on the UI for now
 #include "BKE_pointcache.h"
 #include "BKE_modifier.h"
 
-#include  "BIF_editdeform.h"
-#include  "BIF_graphics.h"
+//XXX #include  "BIF_editdeform.h"
+//XXX #include  "BIF_graphics.h"
 #include  "PIL_time.h"
 
 /* callbacks for errors and interrupts and some goo */
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 0b1563beced..9f9d3be93c2 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -43,7 +43,6 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_customdata.h"
 #include "BKE_utildefines.h"
@@ -877,8 +876,8 @@ static void ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm,
 			static int hasGivenError = 0;
 
 			if(!hasGivenError) {
-				error("Unrecoverable error in SubSurf calculation,"
-				      " mesh is inconsistent.");
+				//XXX error("Unrecoverable error in SubSurf calculation,"
+				//      " mesh is inconsistent.");
 
 				hasGivenError = 1;
 			}
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index ea0dabe1e81..c71fb18c1ab 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -41,7 +41,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_text_types.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 #include "BKE_text.h"
 #include "BKE_library.h"
@@ -1422,7 +1421,7 @@ void txt_print_undo(Text *text)
 
 static void txt_undo_add_op(Text *text, int op)
 {
-	MAX_UNDO_TEST(2);
+	//XXX MAX_UNDO_TEST(2);
 	
 	text->undo_pos++;
 	text->undo_buf[text->undo_pos]= op;
@@ -1435,7 +1434,7 @@ static void txt_undo_add_block(Text *text, int op, char *buf)
 	
 	length= strlen(buf);
 	
-	MAX_UNDO_TEST(length+11);
+	//XXX MAX_UNDO_TEST(length+11);
 
 	text->undo_pos++;
 	text->undo_buf[text->undo_pos]= op;
@@ -1469,7 +1468,7 @@ static void txt_undo_add_block(Text *text, int op, char *buf)
 
 void txt_undo_add_toop(Text *text, int op, unsigned int froml, unsigned short fromc, unsigned int tol, unsigned short toc)
 {
-	MAX_UNDO_TEST(15);
+	//XXX MAX_UNDO_TEST(15);
 
 	if (froml==tol && fromc==toc) return;
 
@@ -1512,7 +1511,7 @@ void txt_undo_add_toop(Text *text, int op, unsigned int froml, unsigned short fr
 
 static void txt_undo_add_charop(Text *text, int op, char c)
 {
-	MAX_UNDO_TEST(4);
+	//XXX MAX_UNDO_TEST(4);
 
 	text->undo_pos++;
 	text->undo_buf[text->undo_pos]= op;
@@ -1734,7 +1733,7 @@ void txt_do_undo(Text *text)
 			text->undo_pos--;
 			break;
 		default:
-			error("Undo buffer error - resetting");
+			//XXX error("Undo buffer error - resetting");
 			text->undo_pos= -1;
 			
 			break;
@@ -1934,7 +1933,7 @@ void txt_do_redo(Text *text)
 			}
 			break;
 		default:
-			error("Undo buffer error - resetting");
+			//XXX error("Undo buffer error - resetting");
 			text->undo_pos= -1;
 
 			break;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index e3b42a59784..9f227f177db 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -61,7 +61,6 @@
 
 #include "BKE_plugin_types.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 
 #include "BKE_global.h"
@@ -175,8 +174,8 @@ PluginTex *add_plugin_tex(char *str)
 	open_plugin_tex(pit);
 	
 	if(pit->doit==0) {
-		if(pit->handle==0) error("no plugin: %s", str);
-		else error("in plugin: %s", str);
+		if(pit->handle==0); //XXX error("no plugin: %s", str);
+		else ; //XXX error("in plugin: %s", str);
 		MEM_freeN(pit);
 		return NULL;
 	}
diff --git a/source/blender/blenkernel/intern/verse_method.c b/source/blender/blenkernel/intern/verse_method.c
index 2b307c86197..42e0d45768e 100644
--- a/source/blender/blenkernel/intern/verse_method.c
+++ b/source/blender/blenkernel/intern/verse_method.c
@@ -41,7 +41,6 @@
 
 #include "BIF_verse.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_library.h"
 #include "BKE_text.h"
 #include "BKE_verse.h"
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 625ca57dbf3..9e926738470 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -48,7 +48,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_utildefines.h"
 
 #include "BKE_library.h"
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index cbaf1f8c605..a703d5c23ea 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -50,7 +50,6 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 
-#include "BKE_bad_level_calls.h"
 #include "BKE_global.h"
 
 #include "IMB_imbuf_types.h"
@@ -59,7 +58,6 @@
 #include "BSE_seqaudio.h"
 
 #include "DNA_scene_types.h"
-#include "blendef.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index d67d16fdba8..c48bea70dc9 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -47,14 +47,12 @@
 #include "BLI_blenlib.h"
 #include "DNA_userdef_types.h"
 
-/*#include "BKE_bad_level_calls.h"*/
 #include "BKE_global.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
 #include "DNA_scene_types.h"
-#include "blendef.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -110,14 +108,14 @@ void start_frameserver(RenderData *rd, int rectx, int recty)
 
 	if (!startup_socket_system()) {
 		G.afbreek = 1;
-		error("Can't startup socket system");
+		//XXX error("Can't startup socket system");
 		return;
 	}
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		shutdown_socket_system();
 		G.afbreek = 1; /* Abort render */
-		error("Can't open socket");
+		//XXX error("Can't open socket");
 		return;
         }
 
@@ -131,14 +129,14 @@ void start_frameserver(RenderData *rd, int rectx, int recty)
 	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		shutdown_socket_system();
 		G.afbreek = 1; /* Abort render */
-		error("Can't bind to socket");
+		//XXX error("Can't bind to socket");
 		return;
         }
 
         if (listen(sock, SOMAXCONN) < 0) {
 		shutdown_socket_system();
 		G.afbreek = 1; /* Abort render */
-		error("Can't establish listen backlog");
+		//XXX error("Can't establish listen backlog");
 		return;
         }
 	connsock = -1;