diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 751415a73f3..d609b231905 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -102,8 +102,6 @@
 #include "RE_shader_ext.h"
 
 #include "BIF_meshlaplacian.h"
-#include "BIF_space.h"
-#include "mydevice.h"
 
 /***/
 
@@ -6901,7 +6899,7 @@ void modifiers_clearErrors(Object *ob)
 		}
 	}
 
-	if (qRedraw) allqueue(REDRAWBUTSEDIT, 0);
+// XXX	if (qRedraw) allqueue(REDRAWBUTSEDIT, 0);
 }
 
 void modifiers_foreachObjectLink(Object *ob, ObjectWalkFunc walk,
@@ -6967,7 +6965,7 @@ void modifier_setError(ModifierData *md, char *format, ...)
 
 	md->error = BLI_strdup(buffer);
 
-	allqueue(REDRAWBUTSEDIT, 0);
+// XXX	allqueue(REDRAWBUTSEDIT, 0);
 }
 
 /* used for buttons, to find out if the 'draw deformed in editmode' option is
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 7b3747503c7..81203ad7176 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -60,7 +60,6 @@
 #include "BLI_threads.h"
 
 #include "BKE_anim.h"
-#include "BKE_bad_level_calls.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
 
@@ -78,9 +77,6 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
-#include "BSE_headerbuttons.h"
-
-#include "blendef.h"
 
 #include "RE_shader_ext.h"
 
@@ -826,7 +822,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm
 		return 0;
 
 	if (!finaldm->deformedOnly && !CustomData_has_layer( &finaldm->faceData, CD_ORIGINDEX ) ) {
-		error("Can't paint with the current modifier stack, disable destructive modifiers");
+// XXX		error("Can't paint with the current modifier stack, disable destructive modifiers");
 		return 0;
 	}
 
@@ -1393,9 +1389,9 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 	pa->lifetime= part->lifetime*ptex.life;
 
 	if(part->type==PART_HAIR)
-		pa->time=0.0f;
+		pa->time= 0.0f;
 	else if(part->type==PART_REACTOR && (part->flag&PART_REACT_STA_END)==0)
-		pa->time=MAXFRAMEF;
+		pa->time= 300000.0f;	/* max frame */
 	else{
 		//icu=find_ipocurve(psys->part->ipo,PART_EMIT_TIME);
 		//if(icu){
@@ -4418,7 +4414,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 
 		/* this is a bad level call, but currently type change
 		 * can happen after redraw, so force redraw from here */
-//		allqueue(REDRAWBUTSOBJECT, 0);
+// XXX		allqueue(REDRAWBUTSOBJECT, 0);
 	}
 	else
 		oldtotpart = psys->totpart;
@@ -4432,7 +4428,8 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 	if(oldtotpart != totpart || psys->recalc&PSYS_ALLOC || (psys->part->childtype && psys->totchild != psys->totpart*child_nbr))
 		alloc = 1;
 
-	if(alloc || psys->recalc&PSYS_DISTR || (psys->vgroup[PSYS_VG_DENSITY] && (G.f & G_WEIGHTPAINT) && ob==OBACT))
+	/* bad context? XXX */
+	if(alloc || psys->recalc&PSYS_DISTR || (psys->vgroup[PSYS_VG_DENSITY] && (G.f & G_WEIGHTPAINT) && ob==(G.scene->basact?G.scene->basact->object:NULL)))
 		distr = 1;
 
 	if(distr || psys->recalc&PSYS_INIT)
@@ -4556,7 +4553,7 @@ void particle_system_update(Object *ob, ParticleSystem *psys){
 	if(!psys_check_enabled(ob, psys))
 		return;
 
-	cfra=bsystem_time(ob,(float)CFRA,0.0);
+	cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
 	psmd= psys_get_modifier(ob, psys);
 
 	/* system was already updated from modifier stack */
diff --git a/source/blender/blenkernel/intern/verse_method.c b/source/blender/blenkernel/intern/verse_method.c
index 89b5282acfd..2b307c86197 100644
--- a/source/blender/blenkernel/intern/verse_method.c
+++ b/source/blender/blenkernel/intern/verse_method.c
@@ -496,7 +496,7 @@ static void cb_o_method_call(void *user_data, VNodeID node_id, uint8 group_id, u
 				if(text) {
 					txt_insert_buf(text, showstr);
 					txt_move_eof(text, 0);
-					allqueue(REDRAWCHAT, 0);
+// XXX					allqueue(REDRAWCHAT, 0);
 				} else {
 					printf("%s> %s: %s\n",arg[0].vstring, arg[1].vstring, arg[2].vstring);
 				}
diff --git a/source/blender/editors/screen/stubs.c b/source/blender/editors/screen/stubs.c
index f0662bbe712..525b969201a 100644
--- a/source/blender/editors/screen/stubs.c
+++ b/source/blender/editors/screen/stubs.c
@@ -31,18 +31,9 @@
 /* various UI stuff */
 void blender_test_break() {}
 void error() {}
-void notice() {}
 void set_timecursor() {}
-void screen_swapbuffers() {}
-void waitcursor() {}
-void get_qual() {}
-void mainqenter() {}
-void saveover() {}
-void texstr() {}
-void pupmenu() {}
 
 /* global vars */
-void *curarea;
 void *editNurb;
 void *editelems;
 
@@ -63,12 +54,7 @@ void BPY_pyconstraint_eval() {}
 void BPY_pyconstraint_target() {}
 
 /* areas */
-void allqueue() {}
-void scrarea_do_windraw() {}
-void areawinset() {}
-void mywinget() {}
 void copy_view3d_lock() {}
-void persp() {}
 
 /* seq */
 void do_render_seq() {}
@@ -76,10 +62,6 @@ void free_editing() {}
 void get_forground_frame_seq() {}
 void build_seqar() {}
 
-/* tools */
-void delete_obj() {}
-void deselectall() {}
-
 /* sculpt */
 void sculptmode_free_all() {}
 void sculptmode_init() {}
@@ -101,7 +83,6 @@ void fluidsimSettingsFree() {}
 void BIF_filelist_freelib() {}
 
 /* audio */
-
 void audiostream_play() {}
 void audiostream_fill() {}
 
diff --git a/source/blender/radiosity/intern/source/raddisplay.c b/source/blender/radiosity/intern/source/raddisplay.c
index dcd53b61f46..0421a633d83 100644
--- a/source/blender/radiosity/intern/source/raddisplay.c
+++ b/source/blender/radiosity/intern/source/raddisplay.c
@@ -57,11 +57,6 @@
 #include "BKE_main.h"
 
 #include "BIF_gl.h"
-#include "BIF_screen.h"
-#include "BIF_space.h"
-#include "BIF_mywindow.h"
-
-#include "BSE_view.h"
 
 #include "radio.h"
 
@@ -208,7 +203,7 @@ void drawpatch_ext(RPatch *patch, unsigned int col)
 
 	cpack(col);
 
-	oldsa= curarea;
+	oldsa= NULL; // XXX curarea;
 
 	sa= G.curscreen->areabase.first;
 	while(sa) {
@@ -216,8 +211,8 @@ void drawpatch_ext(RPatch *patch, unsigned int col)
 			v3d= sa->spacedata.first;
 			
 		 	/* use mywinget() here: otherwise it draws in header */
-		 	if(sa->win != mywinget()) areawinset(sa->win);
-			persp(PERSP_VIEW);
+// XXX		 	if(sa->win != mywinget()) areawinset(sa->win);
+// XXX			persp(PERSP_VIEW);
 			if(v3d->zbuf) glDisable(GL_DEPTH_TEST);
 			drawnodeWire(patch->first);
 			if(v3d->zbuf) glEnable(GL_DEPTH_TEST);	// pretty useless?
@@ -225,7 +220,7 @@ void drawpatch_ext(RPatch *patch, unsigned int col)
 		sa= sa->next;
 	}
 
-	if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
+// XXX	if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
 
 	glFlush();
 	glDrawBuffer(GL_BACK);
@@ -416,21 +411,11 @@ void RAD_drawall(int depth_is_on)
 			}
 		}
 		else {
-			if(!(get_qual()&LR_SHIFTKEY)) {
-
-				for(a=0; a<RG.totface; a++) {
-					RAD_NEXTFACE(a);
-					
-					drawfaceWire(face);
-				}
-			}
-			else {
-				cpack(0);
-				rp= RG.patchbase.first;
-				while(rp) {
-					drawsingnodeWire(rp->first);
-					rp= rp->next;
-				}
+			cpack(0);
+			rp= RG.patchbase.first;
+			while(rp) {
+				drawsingnodeWire(rp->first);
+				rp= rp->next;
 			}
 		}
 	}
@@ -472,19 +457,19 @@ void rad_forcedraw()
 {
  	ScrArea *sa, *oldsa;
 	
-	oldsa= curarea;
+	oldsa= NULL; // XXX curarea;
 
 	sa= G.curscreen->areabase.first;
 	while(sa) {
 		if (sa->spacetype==SPACE_VIEW3D) {
 		 	/* use mywinget() here: othwerwise it draws in header */
-		 	if(sa->win != mywinget()) areawinset(sa->win);
-		 	scrarea_do_windraw(sa);
+// XXX	 	if(sa->win != mywinget()) areawinset(sa->win);
+// XXX		 	scrarea_do_windraw(sa);
 		}
 		sa= sa->next;
 	}
-	screen_swapbuffers();
+// XXX	screen_swapbuffers();
 	
-	if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
+// XXX	if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
 }
 
diff --git a/source/blender/radiosity/intern/source/radfactors.c b/source/blender/radiosity/intern/source/radfactors.c
index b6411522179..555438224e7 100644
--- a/source/blender/radiosity/intern/source/radfactors.c
+++ b/source/blender/radiosity/intern/source/radfactors.c
@@ -50,8 +50,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "BIF_screen.h"
-
 #include "radio.h"
 #include "RE_render_ext.h"       /* for `RE_zbufferall_radio and RE_zbufferall_radio */
 
diff --git a/source/blender/radiosity/intern/source/radio.c b/source/blender/radiosity/intern/source/radio.c
index 8d08632aedb..1b469b319d7 100644
--- a/source/blender/radiosity/intern/source/radio.c
+++ b/source/blender/radiosity/intern/source/radio.c
@@ -91,11 +91,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "BIF_screen.h" /* curarea */
-#include "BIF_space.h" /* allqueue */
-
 #include "radio.h"
-#include "mydevice.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -191,10 +187,10 @@ void rad_status_str(char *str)
 void rad_printstatus()
 {
 	/* actions always are started from a buttonswindow */
-	if(curarea) {
-		scrarea_do_windraw(curarea);
-		screen_swapbuffers();
-	}
+// XX	if(curarea) {
+//		scrarea_do_windraw(curarea);
+//		screen_swapbuffers();
+//	}
 }
 
 void rad_setlimits()
@@ -357,7 +353,7 @@ void rad_subdivshootpatch()
 	removeEqualNodes(RG.nodelim);
 	closehemiwindows();
 	
-	allqueue(REDRAWVIEW3D, 1);
+// XXX	allqueue(REDRAWVIEW3D, 1);
 }
 
 void rad_subdivshootelem(void)
@@ -376,7 +372,7 @@ void rad_subdivshootelem(void)
 	removeEqualNodes(RG.nodelim);
 	closehemiwindows();
 	
-	allqueue(REDRAWVIEW3D, 1);
+// XXX	allqueue(REDRAWVIEW3D, 1);
 }
 
 void rad_limit_subdivide()
diff --git a/source/blender/radiosity/intern/source/radnode.c b/source/blender/radiosity/intern/source/radnode.c
index 168ad2de725..dc2ea3cc34d 100644
--- a/source/blender/radiosity/intern/source/radnode.c
+++ b/source/blender/radiosity/intern/source/radnode.c
@@ -49,8 +49,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "BIF_toolbox.h"
-
 #include "radio.h"
 
 #ifdef HAVE_CONFIG_H
@@ -221,7 +219,7 @@ void free_fastAll()
 void start_fastmalloc(char *str)
 {
 	if(fastmallocstr) {
-		error("Fastmalloc in use: %s", fastmallocstr);
+// XXX		error("Fastmalloc in use: %s", fastmallocstr);
 		return;
 	}
 	fastmallocstr= str;
diff --git a/source/blender/radiosity/intern/source/radpostprocess.c b/source/blender/radiosity/intern/source/radpostprocess.c
index ec2de5f8712..8af25b902d3 100644
--- a/source/blender/radiosity/intern/source/radpostprocess.c
+++ b/source/blender/radiosity/intern/source/radpostprocess.c
@@ -53,7 +53,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_ghash.h"
-#include "BIF_toolbox.h"  // notice()
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
@@ -69,11 +68,6 @@
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_screen.h"		/* waitcursor */
-#include "BIF_editview.h"	/* deselectall */
-
-#include "BDR_editobject.h"	/* delete_obj */
-
 #include "radio.h"
 
 /* locals? not. done in radio.h...  */
@@ -627,7 +621,7 @@ void removeEqualNodes(short limit)
 	thresh= 1.0/(256.0*RG.radfactor);
 	thresh= 3.0*pow(thresh, RG.gamma);
 	
-	waitcursor(1);
+// XXX	waitcursor(1);
 		
 	while(foundone) {
 		foundone= 0;
@@ -682,7 +676,7 @@ void removeEqualNodes(short limit)
 			makeGlobalElemArray();
 		}
 	}
-	waitcursor(0);
+// XXX	waitcursor(0);
 }
 
 unsigned int rad_find_or_add_mvert(Mesh *me, MFace *mf, RNode *orignode, float *w, float *radco, GHash *hash)
@@ -720,8 +714,8 @@ void rad_addmesh(void)
 	if(RG.totface==0)
 		return;
 	
-	if(RG.totmat==MAXMAT)
-		notice("warning: cannot assign more than 16 materials to 1 mesh");
+//	if(RG.totmat==MAXMAT)
+// XXX		notice("warning: cannot assign more than 16 materials to 1 mesh");
 
 	/* create the mesh */
 	ob= add_object(OB_MESH);
@@ -812,7 +806,7 @@ void rad_replacemesh(void)
 {
 	RPatch *rp;
 	
-	deselectall();
+// XXX	deselectall();
 	
 	rp= RG.patchbase.first;
 	while(rp) {
@@ -825,7 +819,7 @@ void rad_replacemesh(void)
 	}
 	
 	copy_objectflags();
-	delete_obj(1);
+// XXX	delete_obj(1);
 	
 	rad_addmesh();
 }
diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c
index 0fef1414482..13c3477383c 100644
--- a/source/blender/radiosity/intern/source/radpreprocess.c
+++ b/source/blender/radiosity/intern/source/radpreprocess.c
@@ -65,16 +65,8 @@
 #include "BKE_object.h" /* during_script() */
 #include "BKE_utildefines.h"
 
-#include "BIF_toolbox.h"
-
-#include "BDR_editface.h"
-
 #include "radio.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 void setparelem(RNode *rn, RPatch *par);
 
 void splitconnected()
diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c
index ee52956bbd2..4073540cbe8 100644
--- a/source/blender/radiosity/intern/source/radrender.c
+++ b/source/blender/radiosity/intern/source/radrender.c
@@ -66,8 +66,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "BIF_screen.h"
-
 #include "radio.h"
 
 /* the radiosity module uses internal includes from render! */
@@ -75,9 +73,6 @@
 #include "render_types.h" 
 #include "renderdatabase.h" 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 /* only needed now for a print, if its useful move to RG */
 static float maxenergy;