9 files changed, 24 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index d15939ce174..71b8f1a4cc3 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -88,6 +88,7 @@ void	txt_find_panel		(struct SpaceText *st, int again);
 void	run_python_script	(struct SpaceText *st);
 int	jumptoline_interactive	(struct SpaceText *st);
 void	txt_export_to_object	(struct Text *text);
+void	txt_export_to_objects(struct Text *text);
 void	indent_paste		(struct Text *text);
 void	unindent		(struct Text *text);
 void 	comment			(struct Text *text);
@@ -98,7 +99,7 @@ void 	comment_paste		(struct Text *text, char *in_buffer);
 void 	uncomment_paste		(struct Text *text, char *in_buffer);
 void	uncomment			(struct Text *text);
 
-	//void	set_tabs			(struct Text *text);
+void	set_tabs			(struct Text *text);
 
 /* Undo opcodes */
 
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 505bfdd92f5..0f94b4c3678 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -67,8 +67,11 @@
 #ifndef M_PI
 #define M_PI		3.14159265358979323846
 #endif
+
+/* used by object.c */
+void Mat4BlendMat4(float [][4], float [][4], float [][4], float );
+
 /* Local function prototypes */
-static void constraint_target_to_mat4 (Object *ob, const char *substring, float mat[][4], float size[3], float ctime);
 
 /* Functions */
 
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index eb889c966be..5b6ee6fed9c 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -967,7 +967,7 @@ static void read_videoscape_nurbs(char *str)
 	Mat3ToEul(omat, ob->rot);
 	EulToMat3(ob->rot, mat);
 	Mat3Inv(imat, mat);
-	Mat3MulMat3(tmat, imat, omat);
+	Mat3MulMat3((float ( * )[3])tmat, imat, omat);
 	
 	while(tot--) {
 		nu= (Nurb*)MEM_callocN(sizeof(Nurb),"nu from exotic");
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 50119cdf3a7..d8c455c9c48 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -297,7 +297,7 @@ void load_image(Image * ima, int flags, char *relabase, int framenum)
 }
 
 
-void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
+static void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
 {
 	struct ImBuf * tbuf1, * tbuf2;
 	
@@ -325,7 +325,7 @@ void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
 	ibuf->y /= 2;
 }
 
-void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
+static void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
 {
 	struct ImBuf * tbuf1, * tbuf2;
 	
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 06197bc99c5..8c10a5c008e 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -878,7 +878,7 @@ float read_ipo_poin(void *poin, int type)
 	return val;
 }
 
-void *give_tex_poin(Tex *tex, int adrcode, int *type )
+static void *give_tex_poin(Tex *tex, int adrcode, int *type )
 {
 	void *poin=0;
 
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index b2ed5f22c29..4d3782e3a85 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -395,7 +395,7 @@ Object *find_basis_mball(Object *basis)
 void calc_mballco(MetaElem *ml, float *vec)
 {
 	if(ml->mat) {
-		Mat4MulVecfl(ml->mat, vec);
+		Mat4MulVecfl((float ( * )[4])ml->mat, vec);
 	}
 }
 
@@ -407,7 +407,7 @@ float densfunc(MetaElem *ball, float x, float y, float z)
 	vec[0]= x;
 	vec[1]= y;
 	vec[2]= z;
-	Mat4MulVecfl(ball->imat, vec);
+	Mat4MulVecfl((float ( * )[4])ball->imat, vec);
 	dx= vec[0];
 	dy= vec[1];
 	dz= vec[2];
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index e20ec017729..06b7d171308 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -40,6 +40,8 @@
 #include "BKE_bad_level_calls.h"
 #include "BLI_blenlib.h"
 
+#include "BKE_screen.h"
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index ed870b19c39..bfc58070974 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -95,6 +95,9 @@ float rescale_friction_to_framerate = 1.0f; // since unit of drag is [kg/sec] we
 
 short SB_ENABLE = 0; // quick hack to switch sb integration in 3d header
 
+/* local prototypes */
+void softbody_scale_time(float steptime);
+int get_scalar_from_named_vertexgroup(Object *ob, char *name, int vertID, float *target);
 
 void softbody_scale_time(float steptime)
 {
@@ -243,7 +246,7 @@ void free_softbody(SoftBody *sb)
 /* ************ dynamics ********** */
 
 /* aye this belongs to arith.c */
-void Vec3PlusStVec(float *v, float s, float *v1)
+static void Vec3PlusStVec(float *v, float s, float *v1)
 {
 	v[0] += s*v1[0];
 	v[1] += s*v1[1];
@@ -494,6 +497,7 @@ static void softbody_restore_prev_step(Object *ob)
 
 
 /* unused */
+#if 0
 static void softbody_apply_goal(Object *ob, float dtime)
 {
 
@@ -518,6 +522,7 @@ static void softbody_apply_goal(Object *ob, float dtime)
 		
 	}
 }
+#endif
 
 static void softbody_apply_goalsnap(Object *ob)
 {
@@ -588,7 +593,7 @@ static void mesh_update_softbody(Object *ob)
 {
 	Mesh *me= ob->data;
 	MVert *mvert= me->mvert;
-	MEdge *medge= me->medge;
+/*	MEdge *medge= me->medge;  */ /*unused*/
 	BodyPoint *bp;
 	int a;
 	if(ob->soft) {
@@ -652,7 +657,7 @@ static void mesh_to_softbody(Object *ob)
 	Mesh *me= ob->data;
 	MVert *mvert= me->mvert;
 	MEdge *medge= me->medge;
-	MFace *mface= me->mface;
+/*	MFace *mface= me->mface; */ /*unused*/
 	BodyPoint *bp;
 	BodySpring *bs;
 	int a;
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index 5980d2b5fc4..c6e39fcd8f2 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -58,6 +58,8 @@
 #include "DNA_scene_types.h"
 /* RPW - End */
 
+#include "BKE_writeavi.h"
+
 static AviMovie *avi=NULL;
 static int sframe;