set many vars & functions as static,

also commented invalid pin theme alpha assignment so bmesh branch builds with -Werror

36 files changed, 226 insertions, 212 deletions

diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 276e8dd3d2f..7f3c5b02ecb 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -96,6 +96,9 @@ void CustomData_data_add(int type, void *data1, void *data2);
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
 					 CustomDataMask mask, int alloctype, int totelem);
 
+/* TODO, not really a public function but readfile.c needs it */
+void CustomData_update_typemap(struct CustomData *data);
+
 /* same as the above, except that this will preserve existing layers, and only
  * add the layers that were not there yet */
 void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index c1cd598026f..f1cc409b87f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -155,27 +155,27 @@ static MFace *dm_dupFaceArray(DerivedMesh *dm)
 	return tmp;
 }
 
-CustomData *dm_getVertCData(DerivedMesh *dm)
+static CustomData *dm_getVertCData(DerivedMesh *dm)
 {
 	return &dm->vertData;
 }
 
-CustomData *dm_getEdgeCData(DerivedMesh *dm)
+static CustomData *dm_getEdgeCData(DerivedMesh *dm)
 {
 	return &dm->edgeData;
 }
 
-CustomData *dm_getFaceCData(DerivedMesh *dm)
+static CustomData *dm_getFaceCData(DerivedMesh *dm)
 {
 	return &dm->faceData;
 }
 
-CustomData *dm_getLoopCData(DerivedMesh *dm)
+static CustomData *dm_getLoopCData(DerivedMesh *dm)
 {
 	return &dm->loopData;
 }
 
-CustomData *dm_getPolyCData(DerivedMesh *dm)
+static CustomData *dm_getPolyCData(DerivedMesh *dm)
 {
 	return &dm->polyData;
 }
@@ -272,7 +272,7 @@ int DM_release(DerivedMesh *dm)
 	}
 }
 
-void dm_add_polys_from_iter(CustomData *ldata, CustomData *pdata, DerivedMesh *dm, int totloop)
+static void dm_add_polys_from_iter(CustomData *ldata, CustomData *pdata, DerivedMesh *dm, int totloop)
 {
 	DMFaceIter *iter = dm->newFaceIter(dm);
 	DMLoopIter *liter;
@@ -507,7 +507,7 @@ void DM_add_tessface_layer(DerivedMesh *dm, int type, int alloctype, void *layer
 	CustomData_add_layer(&dm->faceData, type, alloctype, layer, dm->numFaceData);
 }
 
-void DM_add_loop_layer(DerivedMesh *dm, int type, int alloctype, void *layer)
+static void DM_add_loop_layer(DerivedMesh *dm, int type, int alloctype, void *layer)
 {
 	CustomData_add_layer(&dm->loopData, type, alloctype, layer, dm->numLoopData);
 }
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 3da68a4ab1e..e1d9b7e4853 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1666,7 +1666,7 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *UNUSED(ob))
 	return dm;
 }
 
-DerivedMesh *disabled__CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
+static DerivedMesh *disabled__CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
 {
 	DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
 	                           BLI_countlist(&em->edges),
@@ -2028,12 +2028,12 @@ typedef struct CDDM_FaceIter {
 	CDDM_LoopIter liter;
 } CDDM_FaceIter;
 
-void cddm_freeiter(void *self)
+static void cddm_freeiter(void *self)
 {
 	MEM_freeN(self);
 }
 
-void cddm_stepiter(void *self)
+static void cddm_stepiter(void *self)
 {
 	CDDM_FaceIter *iter = self;
 	MPoly *mp;
@@ -2055,7 +2055,7 @@ void cddm_stepiter(void *self)
 	iter->head.len = mp->totloop;
 }
 
-void *cddm_faceiter_getcddata(void *self, int type, int layer)
+static void *cddm_faceiter_getcddata(void *self, int type, int layer)
 {
 	CDDM_FaceIter *iter = self;
 
@@ -2065,7 +2065,7 @@ void *cddm_faceiter_getcddata(void *self, int type, int layer)
 		                    iter->head.index, layer);
 }
 
-void *cddm_loopiter_getcddata(void *self, int type, int layer)
+static void *cddm_loopiter_getcddata(void *self, int type, int layer)
 {
 	CDDM_LoopIter *iter = self;
 
@@ -2075,7 +2075,7 @@ void *cddm_loopiter_getcddata(void *self, int type, int layer)
 	                             iter->head.index, layer);
 }
 
-void *cddm_loopiter_getvertcddata(void *self, int type, int layer)
+static void *cddm_loopiter_getvertcddata(void *self, int type, int layer)
 {
 	CDDM_LoopIter *iter = self;
 
@@ -2086,7 +2086,7 @@ void *cddm_loopiter_getvertcddata(void *self, int type, int layer)
 	                             iter->cddm->mloop[iter->head.index].v, layer);
 }
 
-DMLoopIter *cddmiter_get_loopiter(void *self)
+static DMLoopIter *cddmiter_get_loopiter(void *self)
 {
 	CDDM_FaceIter *iter = self;
 	CDDM_LoopIter *liter = &iter->liter;
@@ -2102,7 +2102,7 @@ DMLoopIter *cddmiter_get_loopiter(void *self)
 	return (DMLoopIter*) liter;
 }
 
-void cddm_loopiter_step(void *self)
+static void cddm_loopiter_step(void *self)
 {
 	CDDM_LoopIter *liter = self;
 	MLoop *ml;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index a84552fb7c5..9c3771a6842 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1015,7 +1015,7 @@ static void customData_update_offsets(CustomData *data);
 static CustomDataLayer *customData_add_layer__internal(CustomData *data,
 	int type, int alloctype, void *layerdata, int totelem, const char *name);
 
-void customData_update_typemap(CustomData *data)
+void CustomData_update_typemap(CustomData *data)
 {
 	int i, lasttype = -1;
 
@@ -1078,7 +1078,7 @@ void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
 		}
 	}
 
-	customData_update_typemap(dest);
+	CustomData_update_typemap(dest);
 }
 
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
@@ -1143,7 +1143,7 @@ static void customData_update_offsets(CustomData *data)
 	}
 
 	data->totsize = offset;
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 }
 
 int CustomData_get_layer_index(const CustomData *data, int type)
@@ -1448,7 +1448,7 @@ void *CustomData_add_layer(CustomData *data, int type, int alloctype,
 	
 	layer = customData_add_layer__internal(data, type, alloctype, layerdata,
 										   totelem, typeInfo->defaultname);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	if(layer)
 		return layer->data;
@@ -1464,7 +1464,7 @@ void *CustomData_add_layer_named(CustomData *data, int type, int alloctype,
 	
 	layer = customData_add_layer__internal(data, type, alloctype, layerdata,
 										   totelem, name);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	if(layer)
 		return layer->data;
@@ -1503,7 +1503,7 @@ int CustomData_free_layer(CustomData *data, int type, int totelem, int index)
 		customData_resize(data, -CUSTOMDATA_GROW);
 
 	customData_update_offsets(data);
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 
 	return 1;
 }
diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c
index 52c9cc4d379..eb84bfd6c95 100644
--- a/source/blender/blenkernel/intern/editderivedbmesh.c
+++ b/source/blender/blenkernel/intern/editderivedbmesh.c
@@ -1461,7 +1461,7 @@ static void *bmDM_getVertCDData(void *self, int type, int layer)
 	else return CustomData_bmesh_get_n(&iter->bm->vdata, iter->l->v->head.data, type, layer);
 }
 
-void bmDM_iterFree(void *self)
+static void bmDM_iterFree(void *self)
 {
 	MEM_freeN(self);
 }
@@ -1470,7 +1470,7 @@ static void bmDM_nulliterFree(void *UNUSED(self))
 {
 }
 
-DMLoopIter *bmDM_newLoopsIter(void *faceiter)
+static DMLoopIter *bmDM_newLoopsIter(void *faceiter)
 {
 	bmDM_faceIter *fiter = faceiter;
 	bmDM_loopIter *iter = &fiter->loopiter;
@@ -1570,35 +1570,35 @@ static void bmDM_release(DerivedMesh *dm)
 	}
 }
 
-CustomData *bmDm_getVertDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getVertDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->vdata;
 }
 
-CustomData *bmDm_getEdgeDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getEdgeDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->edata;
 }
 
-CustomData *bmDm_getTessFaceDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getTessFaceDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->dm.faceData;
 }
 
-CustomData *bmDm_getLoopDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getLoopDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
 	return &bmdm->tc->bm->ldata;
 }
 
-CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index b5b6961c737..4d452b8fe16 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -130,7 +130,7 @@ static const char *cmpcode_to_str(int code)
 
 /*thresh is threshold for comparing vertices, uvs, vertex colors,
   weights, etc.*/
-int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float thresh)
+static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float thresh)
 {
 	CustomDataLayer *l1, *l2;
 	int i, i1=0, i2=0, tot, j;
@@ -1825,7 +1825,7 @@ void mesh_calc_tessface_normals(MVert *mverts, int numVerts, MFace *mfaces, int
 }
 
 
-void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol) 
+static void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol)
 {
 	MTFace *texface;
 	MTexPoly *texpoly;
@@ -1835,10 +1835,11 @@ void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int
 	MFace *mf;
 	int i;
 
+	mf = me->mface + findex;
+
 	for(i=0; i < numTex; i++){
 		texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
 		texpoly = CustomData_get_n(&me->pdata, CD_MTEXPOLY, findex, i); 
-		mf = me->mface + findex;
 		
 		texpoly->tpage = texface->tpage;
 		texpoly->flag = texface->flag;
@@ -1858,7 +1859,6 @@ void bmesh_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int
 	}
 
 	for(i=0; i < numCol; i++){
-		mf = me->mface + findex;
 		mloopcol = CustomData_get_n(&me->ldata, CD_MLOOPCOL, loopstart, i);
 		mcol = CustomData_get_n(&me->fdata, CD_MCOL, findex, i);
 
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 6c6c0d53880..704b0098cfa 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -456,7 +456,7 @@ static float *get_ss_weights(WeightTable *wtable, int gridCuts, int faceLen)
 	return wtable->weight_table[faceLen].w;
 }
 
-void free_ss_weights(WeightTable *wtable)
+static void free_ss_weights(WeightTable *wtable)
 {
 	int i;
 
@@ -586,15 +586,15 @@ static int ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm,
 
 /***/
 
-int ccgDM_getVertMapIndex(CCGSubSurf *ss, CCGVert *v) {
+static int ccgDM_getVertMapIndex(CCGSubSurf *ss, CCGVert *v) {
 	return ((int*) ccgSubSurf_getVertUserData(ss, v))[1];
 }
 
-int ccgDM_getEdgeMapIndex(CCGSubSurf *ss, CCGEdge *e) {
+static int ccgDM_getEdgeMapIndex(CCGSubSurf *ss, CCGEdge *e) {
 	return ((int*) ccgSubSurf_getEdgeUserData(ss, e))[1];
 }
 
-int ccgDM_getFaceMapIndex(CCGSubSurf *ss, CCGFace *f) {
+static int ccgDM_getFaceMapIndex(CCGSubSurf *ss, CCGFace *f) {
 	return ((int*) ccgSubSurf_getFaceUserData(ss, f))[1];
 }
 
@@ -1049,7 +1049,7 @@ typedef struct cgdm_faceIter {
 	EdgeHash *ehash; /*edge map for populating loopiter->eindex*/
 } cgdm_faceIter;
 
-void cgdm_faceIterStep(void *self)
+static void cgdm_faceIterStep(void *self)
 {
 	cgdm_faceIter *fiter = self;
 
@@ -1072,7 +1072,7 @@ void cgdm_faceIterStep(void *self)
 	fiter->head.len = 4;
 }
 
-void *cgdm_faceIterCData(void *self, int type, int layer)
+static void *cgdm_faceIterCData(void *self, int type, int layer)
 {
 	cgdm_faceIter *fiter = self;
 	
@@ -1082,7 +1082,7 @@ void *cgdm_faceIterCData(void *self, int type, int layer)
 		return CustomData_get_n(&fiter->cgdm->dm.polyData, type, fiter->head.index, layer);
 }
 
-void cgdm_loopIterStep(void *self)
+static void cgdm_loopIterStep(void *self)
 {
 	cgdm_loopIter *liter = self;
 	MFace *mf = liter->fiter->mface;
@@ -1122,7 +1122,7 @@ void cgdm_loopIterStep(void *self)
 	ccgDM_getFinalVert((DerivedMesh*)liter->cgdm, v1, &liter->head.v);
 }
 
-void *cgdm_loopIterGetVCData(void *self, int type, int layer)
+static void *cgdm_loopIterGetVCData(void *self, int type, int layer)
 {
 	cgdm_loopIter *liter = self;
 
@@ -1131,7 +1131,7 @@ void *cgdm_loopIterGetVCData(void *self, int type, int layer)
 	else return CustomData_get_n(&liter->cgdm->dm.vertData, type, liter->head.vindex, layer);
 }
 
-void *cgdm_loopIterGetCData(void *self, int type, int layer)
+static void *cgdm_loopIterGetCData(void *self, int type, int layer)
 {
 	cgdm_loopIter *liter = self;
 
@@ -1140,7 +1140,7 @@ void *cgdm_loopIterGetCData(void *self, int type, int layer)
 	else return CustomData_get_n(&liter->cgdm->dm.loopData, type, liter->lindex, layer);
 }
 
-DMLoopIter *cgdm_faceIterGetLIter(void *self)
+static DMLoopIter *cgdm_faceIterGetLIter(void *self)
 {
 	cgdm_faceIter *fiter = self;
 	
@@ -1151,7 +1151,7 @@ DMLoopIter *cgdm_faceIterGetLIter(void *self)
 	return (DMLoopIter*) &fiter->liter;
 }
 
-void cgdm_faceIterFree(void *vfiter)
+static void cgdm_faceIterFree(void *vfiter)
 {
 	cgdm_faceIter *fiter = vfiter;
 
@@ -1159,7 +1159,7 @@ void cgdm_faceIterFree(void *vfiter)
 	MEM_freeN(fiter);
 }
 
-DMFaceIter *cgdm_newFaceIter(DerivedMesh *dm)
+static DMFaceIter *cgdm_newFaceIter(DerivedMesh *dm)
 {
 	cgdm_faceIter *fiter = MEM_callocN(sizeof(cgdm_faceIter), "cgdm_faceIter");
 	MEdge medge;
@@ -1501,7 +1501,7 @@ static void ccgDM_drawLooseEdges(DerivedMesh *dm) {
 	ccgEdgeIterator_free(ei);
 }
 
-void ccgDM_glNormalFast(float *a, float *b, float *c, float *d)
+static void ccgDM_glNormalFast(float *a, float *b, float *c, float *d)
 {
 	float a_cX = c[0]-a[0], a_cY = c[1]-a[1], a_cZ = c[2]-a[2];
 	float b_dX = d[0]-b[0], b_dY = d[1]-b[1], b_dZ = d[2]-b[2];
@@ -2245,7 +2245,7 @@ static void cgdm_release(DerivedMesh *dm) {
 	}
 }
 
-void ccg_loops_to_corners(CustomData *fdata, CustomData *ldata, 
+static void ccg_loops_to_corners(CustomData *fdata, CustomData *ldata, 
 			  CustomData *pdata, int loopstart, int findex, 
 			  int polyindex, int numTex, int numCol) 
 {
diff --git a/source/blender/blenlib/intern/BLI_cellalloc.c b/source/blender/blenlib/intern/BLI_cellalloc.c
index 43af8045595..47013535ce3 100644
--- a/source/blender/blenlib/intern/BLI_cellalloc.c
+++ b/source/blender/blenlib/intern/BLI_cellalloc.c
@@ -48,11 +48,13 @@
 #include "DNA_listBase.h"
 #include "BLI_mempool.h"
 
+#include "BLI_cellalloc.h" /* own include */
+
 #include <string.h> 
 
 static BLI_mempool **pools;
 static int totpool = 0;
-ListBase active_mem = {NULL, NULL};
+static ListBase active_mem = {NULL, NULL};
 static int celltotblock = 0;
 
 #define MEMIDCHECK	('a' | ('b' << 4) | ('c' << 8) | ('d' << 12))
@@ -61,13 +63,13 @@ typedef struct MemHeader {
 	struct MemHeader *next, *prev;
 
 	int size;
-	char *tag;
+	const char *tag;
 	int idcheck;
 } MemHeader;
 
 //#define USE_GUARDEDALLOC
 
-void *BLI_cellalloc_malloc(long size, char *tag)
+void *BLI_cellalloc_malloc(long size, const char *tag)
 {
 	MemHeader *memh;
 	int slot = size + sizeof(MemHeader);
@@ -110,7 +112,7 @@ void *BLI_cellalloc_malloc(long size, char *tag)
 	return memh + 1;
 }
 
-void *BLI_cellalloc_calloc(long size, char *tag)
+void *BLI_cellalloc_calloc(long size, const char *tag)
 {
 	void *mem = BLI_cellalloc_malloc(size, tag);
 	BMEMSET(mem, 0, size);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ae2baab7edc..14f6196017d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3513,7 +3513,6 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte
 }
 
 /*this isn't really a public api function, so prototyped here*/
-void customData_update_typemap(CustomData *data);
 static void direct_link_customdata(FileData *fd, CustomData *data, int count)
 {
 	int i = 0;
@@ -3535,7 +3534,7 @@ static void direct_link_customdata(FileData *fd, CustomData *data, int count)
 		}
 	}
 
-	customData_update_typemap(data);
+	CustomData_update_typemap(data);
 }
 
 static void direct_link_mesh(FileData *fd, Mesh *mesh)
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index d0308c078e3..bba4ecc56d2 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -82,7 +82,7 @@ void BM_Data_Interp_From_Verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, flo
 */
 
 
-void BM_Data_Vert_Average(BMesh *UNUSED(bm), BMFace *UNUSED(f))
+static void BM_Data_Vert_Average(BMesh *UNUSED(bm), BMFace *UNUSED(f))
 {
 	// BMIter iter;
 }
@@ -294,7 +294,7 @@ static void cross_v3_v3v3_d(double r[3], const double a[3], const double b[3])
 }
 
 /* distance v1 to line-piece v2-v3 */
-double dist_to_line_segment_v2_d(double v1[3], double v2[3], double v3[3]) 
+static double dist_to_line_segment_v2_d(double v1[3], double v2[3], double v3[3]) 
 {
 	double labda, rc[2], pt[2], len;
 	
@@ -334,7 +334,7 @@ MINLINE double line_point_side_v2_d(const double *l1, const double *l2, const do
 }
 
 /* point in quad - only convex quads */
-int isect_point_quad_v2_d(double pt[2], double v1[2], double v2[2], double v3[2], double v4[2])
+static int isect_point_quad_v2_d(double pt[2], double v1[2], double v2[2], double v3[2], double v4[2])
 {
 	if (line_point_side_v2_d(v1,v2,pt)>=0.0) {
 		if (line_point_side_v2_d(v2,v3,pt)>=0.0) {
@@ -439,7 +439,7 @@ static double quad_coord(double aa[3], double bb[3], double cc[3], double dd[3],
 	return f1;
 }
 
-int quad_co(double *x, double *y, double v1[3], double v2[3], double v3[3], double v4[3], double p[3], float n[3])
+static int quad_co(double *x, double *y, double v1[3], double v2[3], double v3[3], double v4[3], double p[3], float n[3])
 {
 	float projverts[5][3], n2[3];
 	double dprojverts[4][3], origin[3]={0.0f, 0.0f, 0.0f};
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 3180ac4c8de..3fa34aafe8a 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -335,7 +335,7 @@ static void bmesh_rationalize_normals(BMesh *bm, int undo) {
 	BMO_Finish_Op(bm, &bmop);
 }
 
-void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
+static void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
 {
 	/*switch multires data out of tangent space*/
 	if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c
index eebd63fc5c4..82ad96db038 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_newcore.c
@@ -79,7 +79,7 @@ static void inherit_face(BMesh *bm, BMBaseFace *basef)
 }
 */
 
-void BM_SubClass(BMesh *UNUSED(bm), BMLayerType *UNUSED(type))
+static void BM_SubClass(BMesh *UNUSED(bm), BMLayerType *UNUSED(type))
 {
 }
 
@@ -201,7 +201,7 @@ static BMLoop *bmesh_create_loop(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, BML
 	return l;
 }
 
-BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv, BMEdge *starte) {
+static BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv, BMEdge *starte) {
 	BMBaseLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
 	BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, f, NULL);
 	int i;
@@ -464,7 +464,7 @@ int bmesh_check_element(BMesh *UNUSED(bm), void *element, int type) {
 	return err;
 }
 
-void bmesh_kill_loop(BMesh *bm, BMLoop *l) {
+static void bmesh_kill_loop(BMesh *bm, BMLoop *l) {
 	int i;
 	
 	for (i=0; i<bm->totlayer; i++) {
@@ -655,7 +655,7 @@ void BM_Kill_Vert(BMesh *bm, BMVert *v) {
  *	1 for success, 0 for failure.
  */
 
-int bmesh_loop_length(BMLoop *l)
+static int bmesh_loop_length(BMLoop *l)
 {
 	BMLoop *ol = l;
 	int i = 0;
@@ -668,7 +668,7 @@ int bmesh_loop_length(BMLoop *l)
 	return i;
 }
 
-int bmesh_loop_reverse_loop(BMesh *bm, BMFace *f, BMLoopList *lst){
+static int bmesh_loop_reverse_loop(BMesh *bm, BMFace *f, BMLoopList *lst){
 	BMLoop *l = lst->first, *curloop, *oldprev, *oldnext;
 	BMEdge **edar = NULL;
 	MDisps *md;
@@ -754,7 +754,7 @@ int bmesh_loop_reverse(BMesh *bm, BMFace *f)
 	return bmesh_loop_reverse_loop(bm, f, f->loops.first);
 }
 
-void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
 {
 	BMHeader **eles = veles;
 	int i;
@@ -764,7 +764,7 @@ void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
 	}
 }
 
-void bmesh_clear_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_clear_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
 {
 	BMHeader **eles = veles;
 	int i;
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 3614062aa00..20d7db78019 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -71,7 +71,7 @@ note that slots default to being input slots.
 
   Smoothes vertices by using a basic vertex averaging scheme.
 */
-BMOpDefine def_vertexsmooth = {
+static BMOpDefine def_vertexsmooth = {
 	"vertexsmooth",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
 	 {BMOP_OPSLOT_INT, "mirror_clip_x"}, //set vertices close to the x axis before the operation to 0
@@ -90,7 +90,7 @@ BMOpDefine def_vertexsmooth = {
   Computes an "outside" normal for the specified input faces.
 */
 
-BMOpDefine def_righthandfaces = {
+static BMOpDefine def_righthandfaces = {
 	"righthandfaces",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"},
 	 {BMOP_OPSLOT_INT, "doflip"}, //internal flag, used by bmesh_rationalize_normals
@@ -110,7 +110,7 @@ BMOpDefine def_righthandfaces = {
   if usefaces is 0 then geomout spits out verts and edges, 
   otherwise it spits out faces.
   */
-BMOpDefine def_regionextend = {
+static BMOpDefine def_regionextend = {
 	"regionextend",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"}, //input geometry
 	 {BMOP_OPSLOT_ELEMENT_BUF, "geomout"}, //output slot, computed boundary geometry.
@@ -128,7 +128,7 @@ BMOpDefine def_regionextend = {
   Rotates edges topologically.  Also known as "spin edge" to some people.
   Simple example: [/] becomes [|] then [\].
 */
-BMOpDefine def_edgerotate = {
+static BMOpDefine def_edgerotate = {
 	"edgerotate",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, //input edges
 	 {BMOP_OPSLOT_ELEMENT_BUF, "edgeout"}, //newly spun edges
@@ -145,7 +145,7 @@ BMOpDefine def_edgerotate = {
   Reverses the winding (vertex order) of faces.  This has the effect of
   flipping the normal.
 */
-BMOpDefine def_reversefaces = {
+static BMOpDefine def_reversefaces = {
 	"reversefaces",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, //input faces
 	{0} /*null-terminating sentinel*/,
@@ -160,7 +160,7 @@ BMOpDefine def_reversefaces = {
   Splits input edges (but doesn't do anything else).
   This creates a 2-valence vert.
 */
-BMOpDefine def_edgebisect = {
+static BMOpDefine def_edgebisect = {
 	"edgebisect",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, //input edges
 	{BMOP_OPSLOT_INT, "numcuts"}, //number of cuts
@@ -179,7 +179,7 @@ BMOpDefine def_edgebisect = {
   parameter (which defines the minimum distance for welding to happen).
 */
 
-BMOpDefine def_mirror = {
+static BMOpDefine def_mirror = {
 	"mirror",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"}, //input geometry
 	 {BMOP_OPSLOT_MAT, "mat"}, //matrix defining the mirror transformation
@@ -199,7 +199,7 @@ BMOpDefine def_mirror = {
   Takes input verts and find vertices they should weld to.  Outputs a
   mapping slot suitable for use with the weld verts bmop.
 */
-BMOpDefine def_finddoubles = {
+static BMOpDefine def_finddoubles = {
 	"finddoubles",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
 	 {BMOP_OPSLOT_ELEMENT_BUF, "keepverts"}, //list of verts to keep
@@ -216,7 +216,7 @@ BMOpDefine def_finddoubles = {
   Finds groups of vertices closer then dist and merges them together,
   using the weld verts bmop.
 */
-BMOpDefine def_removedoubles = {
+static BMOpDefine def_removedoubles = {
 	"removedoubles",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input verts
 	 {BMOP_OPSLOT_FLT,         "dist"}, //minimum distance
@@ -232,7 +232,7 @@ BMOpDefine def_removedoubles = {
   using the weld verts bmop.  The merges must go from a vert not in
   verts to one in verts.
 */
-BMOpDefine def_automerge = {
+static BMOpDefine def_automerge = {
 	"automerge",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input verts
 	 {BMOP_OPSLOT_FLT,         "dist"}, //minimum distance
@@ -246,7 +246,7 @@ BMOpDefine def_automerge = {
 
   Collapses connected vertices
 */
-BMOpDefine def_collapse = {
+static BMOpDefine def_collapse = {
 	"collapse",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /*input edges*/
 	 {0, /*null-terminating sentinel*/}},
@@ -260,7 +260,7 @@ BMOpDefine def_collapse = {
 
   Merge uv/vcols at a specific vertex.
 */
-BMOpDefine def_pointmerge_facedata = {
+static BMOpDefine def_pointmerge_facedata = {
 	"pointmerge_facedata",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, /*input vertices*/
 	 {BMOP_OPSLOT_ELEMENT_BUF, "snapv"}, /*snap vertex*/
@@ -276,7 +276,7 @@ BMOpDefine def_pointmerge_facedata = {
   the bounding box center. (I know, it's not averaging but
   the vert_snap_to_bb_center is just too long).
 */
-BMOpDefine def_vert_average_facedata = {
+static BMOpDefine def_vert_average_facedata = {
 	"vert_average_facedata",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, /*input vertices*/
 	 {0, /*null-terminating sentinel*/}},
@@ -289,7 +289,7 @@ BMOpDefine def_vert_average_facedata = {
 
   Merge verts together at a point.
 */
-BMOpDefine def_pointmerge = {
+static BMOpDefine def_pointmerge = {
 	"pointmerge",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, /*input vertices*/
 	 {BMOP_OPSLOT_VEC,         "mergeco"},
@@ -303,7 +303,7 @@ BMOpDefine def_pointmerge = {
 
   Collapses connected UV vertices.
 */
-BMOpDefine def_collapse_uvs = {
+static BMOpDefine def_collapse_uvs = {
 	"collapse_uvs",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /*input edges*/
 	 {0, /*null-terminating sentinel*/}},
@@ -318,7 +318,7 @@ BMOpDefine def_collapse_uvs = {
   use or will use this bmop).  You pass in mappings from vertices to the vertices
   they weld with.
 */
-BMOpDefine def_weldverts = {
+static BMOpDefine def_weldverts = {
 	"weldverts",
 	{{BMOP_OPSLOT_MAPPING, "targetmap"}, /*maps welded vertices to verts they should weld to.*/
 	 {0, /*null-terminating sentinel*/}},
@@ -332,7 +332,7 @@ BMOpDefine def_weldverts = {
   Creates a single vertex; this bmop was necassary
   for click-create-vertex.
 */
-BMOpDefine def_makevert = {
+static BMOpDefine def_makevert = {
 	"makevert",
 	{{BMOP_OPSLOT_VEC, "co"}, //the coordinate of the new vert
 	{BMOP_OPSLOT_ELEMENT_BUF, "newvertout"}, //the new vert
@@ -348,7 +348,7 @@ BMOpDefine def_makevert = {
   to various settings and stuff.
 
   */
-BMOpDefine def_join_triangles= {
+static BMOpDefine def_join_triangles= {
 	"join_triangles",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, //input geometry.
 	 {BMOP_OPSLOT_ELEMENT_BUF, "faceout"}, //joined faces
@@ -373,7 +373,7 @@ BMOpDefine def_join_triangles= {
   Three verts become a triangle, four become a quad.  Two
   become a wire edge.
   */
-BMOpDefine def_contextual_create= {
+static BMOpDefine def_contextual_create= {
 	"contextual_create",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"}, //input geometry.
 	 {BMOP_OPSLOT_ELEMENT_BUF, "faceout"}, //newly-made face(s)
@@ -382,7 +382,7 @@ BMOpDefine def_contextual_create= {
 	BMOP_UNTAN_MULTIRES,
 };
 
-BMOpDefine def_edgenet_fill= {
+static BMOpDefine def_edgenet_fill= {
 	"edgenet_fill",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /*input edges*/
 	 {BMOP_OPSLOT_MAPPING,     "restrict"}, /*restricts edges to groups.  maps edges to integers*/
@@ -405,7 +405,7 @@ BMOpDefine def_edgenet_fill= {
   * Two loops; two edges are added to connect the endpoints (based on the
     shortest distance between each endpont).
 */
-BMOpDefine def_edgenet_prepare= {
+static BMOpDefine def_edgenet_prepare= {
 	"edgenet_prepare",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, //input edges
 	 {BMOP_OPSLOT_ELEMENT_BUF, "edgeout"}, //new edges
@@ -420,7 +420,7 @@ BMOpDefine def_edgenet_prepare= {
   Rotate vertices around a center, using a 3x3 rotation
   matrix.  Equivilent of the old rotateflag function.
 */
-BMOpDefine def_rotate = {
+static BMOpDefine def_rotate = {
 	"rotate",
 	{{BMOP_OPSLOT_VEC, "cent"}, //center of rotation
 	 {BMOP_OPSLOT_MAT, "mat"}, //matrix defining rotation
@@ -436,7 +436,7 @@ BMOpDefine def_rotate = {
   Translate vertices by an offset.  Equivelent of the
   old translateflag function.
 */
-BMOpDefine def_translate= {
+static BMOpDefine def_translate= {
 	"translate",
 	{{BMOP_OPSLOT_VEC, "vec"}, //translation offset
 	{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
@@ -450,7 +450,7 @@ BMOpDefine def_translate= {
 
   Scales vertices by an offset.
 */
-BMOpDefine def_scale= {
+static BMOpDefine def_scale= {
 	"scale",
 	{{BMOP_OPSLOT_VEC, "vec"}, //scale factor
 	{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
@@ -466,7 +466,7 @@ BMOpDefine def_scale= {
   Transforms a set of vertices by a matrix.  Multiplies
   the vertex coordinates with the matrix.
 */
-BMOpDefine def_transform = {
+static BMOpDefine def_transform = {
 	"transform",
 	{{BMOP_OPSLOT_MAT, "mat"}, //transform matrix
 	{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
@@ -481,7 +481,7 @@ BMOpDefine def_transform = {
   Loads a bmesh into an object/mesh.  This is a "private"
   bmop.
 */
-BMOpDefine def_object_load_bmesh = {
+static BMOpDefine def_object_load_bmesh = {
 	"object_load_bmesh",
 	{{BMOP_OPSLOT_PNT, "scene"},
 	{BMOP_OPSLOT_PNT, "object"},
@@ -496,7 +496,7 @@ BMOpDefine def_object_load_bmesh = {
 
   Converts a bmesh to a Mesh.  This is reserved for exiting editmode.
 */
-BMOpDefine def_bmesh_to_mesh = {
+static BMOpDefine def_bmesh_to_mesh = {
 	"bmesh_to_mesh",
 	{{BMOP_OPSLOT_PNT, "mesh"}, //pointer to a mesh structure to fill in
 	 {BMOP_OPSLOT_PNT, "object"}, //pointer to an object structure
@@ -512,7 +512,7 @@ BMOpDefine def_bmesh_to_mesh = {
   Load the contents of a mesh into the bmesh.  this bmop is private, it's
   reserved exclusively for entering editmode.
 */
-BMOpDefine def_mesh_to_bmesh = {
+static BMOpDefine def_mesh_to_bmesh = {
 	"mesh_to_bmesh",
 	{{BMOP_OPSLOT_PNT, "mesh"}, //pointer to a Mesh structure
 	 {BMOP_OPSLOT_PNT, "object"}, //pointer to an Object structure
@@ -527,7 +527,7 @@ BMOpDefine def_mesh_to_bmesh = {
 
   Extrudes faces individually.
 */
-BMOpDefine def_extrude_indivface = {
+static BMOpDefine def_extrude_indivface = {
 	"extrude_face_indiv",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, //input faces
 	{BMOP_OPSLOT_ELEMENT_BUF, "faceout"}, //output faces
@@ -543,7 +543,7 @@ BMOpDefine def_extrude_indivface = {
   Extrudes Edges into faces, note that this is very simple, there's no fancy
   winged extrusion.
 */
-BMOpDefine def_extrude_onlyedge = {
+static BMOpDefine def_extrude_onlyedge = {
 	"extrude_edge_only",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, //input vertices
 	{BMOP_OPSLOT_ELEMENT_BUF, "geomout"}, //output geometry
@@ -557,7 +557,7 @@ BMOpDefine def_extrude_onlyedge = {
 
   Extrudes wire edges from vertices.
 */
-BMOpDefine def_extrudeverts_indiv = {
+static BMOpDefine def_extrudeverts_indiv = {
 	"extrude_vert_indiv",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, //input vertices
 	{BMOP_OPSLOT_ELEMENT_BUF, "edgeout"}, //output wire edges
@@ -567,7 +567,7 @@ BMOpDefine def_extrudeverts_indiv = {
 	0
 };
 
-BMOpDefine def_connectverts = {
+static BMOpDefine def_connectverts = {
 	"connectverts",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "edgeout"},
@@ -576,7 +576,7 @@ BMOpDefine def_connectverts = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_extrudefaceregion = {
+static BMOpDefine def_extrudefaceregion = {
 	"extrudefaceregion",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edgefacein"},
 	{BMOP_OPSLOT_MAPPING, "exclude"},
@@ -586,7 +586,7 @@ BMOpDefine def_extrudefaceregion = {
 	0
 };
 
-BMOpDefine def_dissolvevertsop = {
+static BMOpDefine def_dissolvevertsop = {
 	"dissolveverts",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"},
 	{0} /*null-terminating sentinel*/},
@@ -594,7 +594,7 @@ BMOpDefine def_dissolvevertsop = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_dissolveedgessop = {
+static BMOpDefine def_dissolveedgessop = {
 	"dissolveedges",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "regionout"},
@@ -603,7 +603,7 @@ BMOpDefine def_dissolveedgessop = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_dissolveedgeloopsop = {
+static BMOpDefine def_dissolveedgeloopsop = {
 	"dissolveedgeloop",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "regionout"},
@@ -612,7 +612,7 @@ BMOpDefine def_dissolveedgeloopsop = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_dissolvefacesop = {
+static BMOpDefine def_dissolvefacesop = {
 	"dissolvefaces",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "regionout"},
@@ -622,7 +622,7 @@ BMOpDefine def_dissolvefacesop = {
 };
 
 
-BMOpDefine def_triangop = {
+static BMOpDefine def_triangop = {
 	"triangulate",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "edgeout"},
@@ -633,7 +633,7 @@ BMOpDefine def_triangop = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_subdop = {
+static BMOpDefine def_subdop = {
 	"esubd",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"},
 	{BMOP_OPSLOT_INT, "numcuts"},
@@ -659,7 +659,7 @@ BMOpDefine def_subdop = {
 	BMOP_UNTAN_MULTIRES
 };
 
-BMOpDefine def_delop = {
+static BMOpDefine def_delop = {
 	"del",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"}, {BMOP_OPSLOT_INT, "context"},
 	{0} /*null-terminating sentinel*/},
@@ -667,7 +667,7 @@ BMOpDefine def_delop = {
 	0
 };
 
-BMOpDefine def_dupeop = {
+static BMOpDefine def_dupeop = {
 	"dupe",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "origout"},
@@ -683,7 +683,7 @@ BMOpDefine def_dupeop = {
 	0
 };
 
-BMOpDefine def_splitop = {
+static BMOpDefine def_splitop = {
 	"split",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"},
 	{BMOP_OPSLOT_ELEMENT_BUF, "geomout"},
@@ -700,7 +700,7 @@ BMOpDefine def_splitop = {
 
   Find similar faces (area/material/perimeter....).
 */
-BMOpDefine def_similarfaces = {
+static BMOpDefine def_similarfaces = {
 	"similarfaces",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "faceout"}, /* output faces */
@@ -716,7 +716,7 @@ BMOpDefine def_similarfaces = {
 
   Find similar edges (length, direction, edge, seam,....).
 */
-BMOpDefine def_similaredges = {
+static BMOpDefine def_similaredges = {
 	"similaredges",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /* input edges */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "edgeout"}, /* output edges */
@@ -732,7 +732,7 @@ BMOpDefine def_similaredges = {
 
   Find similar vertices (normal, face, vertex group,....).
 */
-BMOpDefine def_similarverts = {
+static BMOpDefine def_similarverts = {
 	"similarverts",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "verts"}, /* input vertices */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, /* output vertices */
@@ -747,7 +747,7 @@ BMOpDefine def_similarverts = {
 ** uv rotation
 ** cycle the uvs
 */
-BMOpDefine def_meshrotateuvs = {
+static BMOpDefine def_meshrotateuvs = {
 	"meshrotateuvs",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {BMOP_OPSLOT_INT, "dir"},			/* direction */
@@ -760,7 +760,7 @@ BMOpDefine def_meshrotateuvs = {
 ** uv reverse
 ** reverse the uvs
 */
-BMOpDefine def_meshreverseuvs = {
+static BMOpDefine def_meshreverseuvs = {
 	"meshreverseuvs",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {0} /*null-terminating sentinel*/},
@@ -772,7 +772,7 @@ BMOpDefine def_meshreverseuvs = {
 ** color rotation
 ** cycle the colors
 */
-BMOpDefine def_meshrotatecolors = {
+static BMOpDefine def_meshrotatecolors = {
 	"meshrotatecolors",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {BMOP_OPSLOT_INT, "dir"},			/* direction */
@@ -785,7 +785,7 @@ BMOpDefine def_meshrotatecolors = {
 ** color reverse
 ** reverse the colors
 */
-BMOpDefine def_meshreversecolors = {
+static BMOpDefine def_meshreversecolors = {
 	"meshreversecolors",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {0} /*null-terminating sentinel*/},
@@ -798,7 +798,7 @@ BMOpDefine def_meshreversecolors = {
 
   Find similar vertices (normal, face, vertex group,....).
 */
-BMOpDefine def_vertexshortestpath = {
+static BMOpDefine def_vertexshortestpath = {
 	"vertexshortestpath",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "startv"}, /* start vertex */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "endv"}, /* end vertex */
@@ -814,7 +814,7 @@ BMOpDefine def_vertexshortestpath = {
 
   Disconnects faces along input edges.
  */
-BMOpDefine def_edgesplit = {
+static BMOpDefine def_edgesplit = {
 	"edgesplit",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /* input edges */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "edgeout1"}, /* old output disconnected edges */
@@ -829,7 +829,7 @@ BMOpDefine def_edgesplit = {
 
   Creates a grid with a variable number of subdivisions
 */
-BMOpDefine def_create_grid = {
+static BMOpDefine def_create_grid = {
 	"create_grid",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_INT,         "xsegments"}, //number of x segments
@@ -846,7 +846,7 @@ BMOpDefine def_create_grid = {
 
   Creates a grid with a variable number of subdivisions
 */
-BMOpDefine def_create_uvsphere = {
+static BMOpDefine def_create_uvsphere = {
 	"create_uvsphere",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_INT,         "segments"}, //number of u segments
@@ -863,7 +863,7 @@ BMOpDefine def_create_uvsphere = {
 
   Creates a grid with a variable number of subdivisions
 */
-BMOpDefine def_create_icosphere = {
+static BMOpDefine def_create_icosphere = {
 	"create_icosphere",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_INT,         "subdivisions"}, //how many times to recursively subdivide the sphere
@@ -879,7 +879,7 @@ BMOpDefine def_create_icosphere = {
 
   Creates a monkey.  Be wary.
 */
-BMOpDefine def_create_monkey = {
+static BMOpDefine def_create_monkey = {
 	"create_monkey",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_MAT, "mat"}, //matrix to multiply the new geometry with--
@@ -893,7 +893,7 @@ BMOpDefine def_create_monkey = {
 
   Creates a cone with variable depth at both ends
 */
-BMOpDefine def_create_cone = {
+static BMOpDefine def_create_cone = {
 	"create_cone",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_INT, "cap_ends"}, //wheter or not to fill in the ends with faces
@@ -911,7 +911,7 @@ BMOpDefine def_create_cone = {
 /*
 Creates a circle
 */
-BMOpDefine def_create_circle = {
+static BMOpDefine def_create_circle = {
   "create_circle",
   {{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
    {BMOP_OPSLOT_INT, "cap_ends"}, //wheter or not to fill in the ends with faces
@@ -929,7 +929,7 @@ BMOpDefine def_create_circle = {
 
   Creates a cone with variable depth at both ends
 */
-BMOpDefine def_create_cube = {
+static BMOpDefine def_create_cube = {
 	"create_cube",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "vertout"}, //output verts
 	 {BMOP_OPSLOT_FLT, "size"}, //size of the cube
@@ -944,7 +944,7 @@ BMOpDefine def_create_cube = {
 
   Bevels edges and vertices
  */
-BMOpDefine def_bevel = {
+static BMOpDefine def_bevel = {
 	"bevel",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "geom"}, /* input edges and vertices */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "face_spans"}, /* new geometry */
@@ -962,7 +962,7 @@ BMOpDefine def_bevel = {
 
   Makes triangle a bit nicer
  */
-BMOpDefine def_beautify_fill = {
+static BMOpDefine def_beautify_fill = {
 "beautify_fill",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "faces"}, /* input faces */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "constrain_edges"}, /* edges that can't be flipped */
@@ -977,7 +977,7 @@ BMOpDefine def_beautify_fill = {
 
   Fill edges with triangles
  */
-BMOpDefine def_triangle_fill = {
+static BMOpDefine def_triangle_fill = {
 	"triangle_fill",
 	{{BMOP_OPSLOT_ELEMENT_BUF, "edges"}, /* input edges */
 	 {BMOP_OPSLOT_ELEMENT_BUF, "geomout"}, /* new faces and edges */
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 1c7502d068b..a664d6a350e 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -521,7 +521,7 @@ static void *alloc_slot_buffer(BMOperator *op, const char *slotname, int len){
  *
 */
 
-void BMO_All_To_Slot(BMesh *bm, BMOperator *op, const char *slotname, int type)
+static void BMO_All_To_Slot(BMesh *bm, BMOperator *op, const char *slotname, int type)
 {
 	BMIter elements;
 	BMHeader *e;
@@ -1306,7 +1306,7 @@ int BMO_CallOpf(BMesh *bm, const char *fmt, ...) {
 #ifdef BMO_ToggleFlag
 #undef BMO_ToggleFlag
 #endif
-void BMO_ToggleFlag(BMesh *bm, void *element, int flag)
+static void BMO_ToggleFlag(BMesh *bm, void *element, int flag)
 {
 	BMHeader *head = element;
 	head->flags[bm->stackdepth-1].f ^= flag;
@@ -1321,7 +1321,7 @@ void BMO_ToggleFlag(BMesh *bm, void *element, int flag)
 #ifdef BMO_SetFlag
 #undef BMO_SetFlag
 #endif
-void BMO_SetFlag(BMesh *bm, void *element, int flag)
+static void BMO_SetFlag(BMesh *bm, void *element, int flag)
 {
 	BMHeader *head = element;
 	head->flags[bm->stackdepth-1].f |= flag;
@@ -1337,7 +1337,7 @@ void BMO_SetFlag(BMesh *bm, void *element, int flag)
 #ifdef BMO_ClearFlag
 #undef BMO_ClearFlag
 #endif
-void BMO_ClearFlag(BMesh *bm, void *element, int flag)
+static void BMO_ClearFlag(BMesh *bm, void *element, int flag)
 {
 	BMHeader *head = element;
 	head->flags[bm->stackdepth-1].f &= ~flag;
@@ -1354,7 +1354,7 @@ void BMO_ClearFlag(BMesh *bm, void *element, int flag)
 #ifdef BMO_TestFlag
 #undef BMO_TestFlag
 #endif
-int BMO_TestFlag(BMesh *bm, void *element, int flag)
+static int BMO_TestFlag(BMesh *bm, void *element, int flag)
 {
 	BMHeader *head = element;
 	if(head->flags[bm->stackdepth-1].f & flag)
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index b33e708f7eb..087557050b1 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -523,7 +523,7 @@ void BM_flip_normal(BMesh *bm, BMFace *f)
 
 /* detects if two line segments cross each other (intersects).
    note, there could be more winding cases then there needs to be. */
-int linecrosses(double *v1, double *v2, double *v3, double *v4)
+static int linecrosses(double *v1, double *v2, double *v3, double *v4)
 {
 	int w1, w2, w3, w4, w5;
 	
@@ -544,7 +544,7 @@ int linecrosses(double *v1, double *v2, double *v3, double *v4)
 
 /* detects if two line segments cross each other (intersects).
    note, there could be more winding cases then there needs to be. */
-int linecrossesf(float *v1, float *v2, float *v3, float *v4)
+static int linecrossesf(float *v1, float *v2, float *v3, float *v4)
 {
 	int w1, w2, w3, w4, w5 /*, ret*/;
 	float mv1[2], mv2[2], mv3[2], mv4[2];
@@ -649,7 +649,7 @@ int BM_Point_In_Face(BMesh *bm, BMFace *f, float co[3])
 	return crosses%2 != 0;
 }
 
-int goodline(float (*projectverts)[3], BMFace *f, int v1i,
+static int goodline(float (*projectverts)[3], BMFace *f, int v1i,
 		 int v2i, int v3i, int UNUSED(nvert)) {
 	BMLoop *l = bm_firstfaceloop(f);
 	double v1[3], v2[3], v3[3], pv1[3], pv2[3];
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index 9b695c2da80..ac36f296776 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -208,7 +208,7 @@ struct BMEdge *bmesh_disk_nextedge(struct BMEdge *e, struct BMVert *v)
 	return NULL;
 }
 
-BMEdge *bmesh_disk_prevedge(BMEdge *e, BMVert *v)
+static BMEdge *bmesh_disk_prevedge(BMEdge *e, BMVert *v)
 {
 	if (v == e->v1)
 		return e->dlink1.prev;
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index 9df9c8067ce..dceaefd1242 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -660,14 +660,14 @@ static void *uvedgeWalker_step(BMWalker *walker)
 }
 
 
-BMWalker shell_walker_type = {
+static BMWalker shell_walker_type = {
 	shellWalker_begin,
 	shellWalker_step,
 	shellWalker_yield,
 	sizeof(shellWalker),
 };
 
-BMWalker islandbound_walker_type = {
+static BMWalker islandbound_walker_type = {
 	islandboundWalker_begin,
 	islandboundWalker_step,
 	islandboundWalker_yield,
@@ -675,14 +675,14 @@ BMWalker islandbound_walker_type = {
 };
 
 
-BMWalker island_walker_type = {
+static BMWalker island_walker_type = {
 	islandWalker_begin,
 	islandWalker_step,
 	islandWalker_yield,
 	sizeof(islandWalker),
 };
 
-BMWalker loop_walker_type = {
+static BMWalker loop_walker_type = {
 	loopWalker_begin,
 	loopWalker_step,
 	loopWalker_yield,
@@ -690,21 +690,21 @@ BMWalker loop_walker_type = {
 };
 
 
-BMWalker faceloop_walker_type = {
+static BMWalker faceloop_walker_type = {
 	faceloopWalker_begin,
 	faceloopWalker_step,
 	faceloopWalker_yield,
 	sizeof(faceloopWalker),
 };
 
-BMWalker edgering_walker_type = {
+static BMWalker edgering_walker_type = {
 	edgeringWalker_begin,
 	edgeringWalker_step,
 	edgeringWalker_yield,
 	sizeof(edgeringWalker),
 };
 
-BMWalker loopdata_region_walker_type = {
+static BMWalker loopdata_region_walker_type = {
 	uvedgeWalker_begin,
 	uvedgeWalker_step,
 	uvedgeWalker_yield,
diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bevel.c
index e21bb9398a5..df56740830d 100644
--- a/source/blender/bmesh/operators/bevel.c
+++ b/source/blender/bmesh/operators/bevel.c
@@ -31,7 +31,7 @@ typedef struct EdgeTag {
 	BMVert *newv1, *newv2;
 } EdgeTag;
 
-void calc_corner_co(BMesh *bm, BMLoop *l, float *co, float fac)
+static void calc_corner_co(BMesh *bm, BMLoop *l, float *co, float fac)
 {
 	float  no[3], /*tan[3]*,*/ vec1[3], vec2[3], v1[3], v2[3], v3[3], v4[3];
 	/*float p1[3], p2[3], w[3];
diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/createops.c
index 3c3d1ee6f4a..78286b045d4 100644
--- a/source/blender/bmesh/operators/createops.c
+++ b/source/blender/bmesh/operators/createops.c
@@ -67,7 +67,7 @@ static int count_edge_faces(BMesh *bm, BMEdge *e);
 
 #define rs_get_edge_link(e, v, ed) ((v) == ((BMEdge*)(e))->v1 ? (Link*)&(((EdgeData*)(ed))->dlink1) : (Link*)&(((EdgeData*)(ed))->dlink2))
 
-int rotsys_append_edge(struct BMEdge *e, struct BMVert *v, 
+static int rotsys_append_edge(struct BMEdge *e, struct BMVert *v, 
 						EdgeData *edata, VertData *vdata)
 {
 	EdgeData *ed = &edata[BMINDEX_GET(e)];
@@ -97,7 +97,7 @@ int rotsys_append_edge(struct BMEdge *e, struct BMVert *v,
 	return 1;
 }
 
-void rotsys_remove_edge(struct BMEdge *e, struct BMVert *v, 
+static void rotsys_remove_edge(struct BMEdge *e, struct BMVert *v, 
 						EdgeData *edata, VertData *vdata)
 {
 	EdgeData *ed = edata + BMINDEX_GET(e);
@@ -121,7 +121,7 @@ void rotsys_remove_edge(struct BMEdge *e, struct BMVert *v,
 	e1->next = e1->prev = NULL;
 }
 
-struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v, 
+static struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v, 
 									EdgeData *edata, VertData *UNUSED(vdata))
 {
 	if (v == e->v1)
@@ -131,7 +131,7 @@ struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v,
 	return NULL;
 }
 
-BMEdge *rotsys_prevedge(BMEdge *e, BMVert *v, 
+static BMEdge *rotsys_prevedge(BMEdge *e, BMVert *v, 
 						EdgeData *edata, VertData *UNUSED(vdata))
 {
 	if (v == e->v1)
@@ -141,7 +141,7 @@ BMEdge *rotsys_prevedge(BMEdge *e, BMVert *v,
 	return NULL;
 }
 
-struct BMEdge *rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
+static struct BMEdge *rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
 {
 	BMEdge **edges = NULL;
 	BMEdge *e2;
@@ -169,7 +169,7 @@ struct BMEdge *rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeDa
 	return 0;
 }
 
-int rotsys_count(struct BMVert *v, EdgeData *edata, VertData *vdata)
+static int rotsys_count(struct BMVert *v, EdgeData *edata, VertData *vdata)
 {
 	BMEdge *e = vdata[BMINDEX_GET(v)].e;
 	int i=0;
@@ -193,7 +193,7 @@ int rotsys_count(struct BMVert *v, EdgeData *edata, VertData *vdata)
 	return i;
 }
 
-int rotsys_fill_faces(BMesh *bm, EdgeData *edata, VertData *vdata)
+static int rotsys_fill_faces(BMesh *bm, EdgeData *edata, VertData *vdata)
 {
 	BMIter iter;
 	BMEdge *e, **edges = NULL;
@@ -259,7 +259,7 @@ int rotsys_fill_faces(BMesh *bm, EdgeData *edata, VertData *vdata)
 	return 0;
 }
 
-void rotsys_make_consistent(BMesh *bm, EdgeData *edata, VertData *vdata)
+static void rotsys_make_consistent(BMesh *bm, EdgeData *edata, VertData *vdata)
 {
 	BMIter iter;
 	BMEdge *e;
@@ -328,14 +328,14 @@ void rotsys_make_consistent(BMesh *bm, EdgeData *edata, VertData *vdata)
 	
 }
 
-void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
+static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
 {
 	BMIter iter;
 	BMEdge *e;
 	BMEdge **edges = NULL;
 	BLI_array_staticdeclare(edges, 256);
 	BMVert *v, *lastv, **verts = NULL;
-	BLI_array_staticdeclare(verts, 256);
+	/*BLI_array_staticdeclare(verts, 256);*/ /*UNUSED*/
 	int i;
 	
 	#define SIGN(n) ((n)<0.0f)
@@ -581,7 +581,7 @@ void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
 	BLI_array_free(edges);
 }
 
-PathBase *edge_pathbase_new(void)
+static PathBase *edge_pathbase_new(void)
 {
 	PathBase *pb = MEM_callocN(sizeof(PathBase), "PathBase");
 
@@ -591,14 +591,14 @@ PathBase *edge_pathbase_new(void)
 	return pb;
 }
 
-void edge_pathbase_free(PathBase *pathbase)
+static void edge_pathbase_free(PathBase *pathbase)
 {
 	BLI_mempool_destroy(pathbase->nodepool);
 	BLI_mempool_destroy(pathbase->pathpool);
 	MEM_freeN(pathbase);
 }
 
-EPath *edge_copy_add_path(PathBase *pb, EPath *path, BMVert *appendv, BMEdge *e)
+static EPath *edge_copy_add_path(PathBase *pb, EPath *path, BMVert *appendv, BMEdge *e)
 {
 	EPath *path2;
 	EPathNode *node, *node2;
@@ -624,7 +624,7 @@ EPath *edge_copy_add_path(PathBase *pb, EPath *path, BMVert *appendv, BMEdge *e)
 	return path2;
 }
 
-EPath *edge_path_new(PathBase *pb, BMVert *start, BMEdge *starte)
+static EPath *edge_path_new(PathBase *pb, BMVert *start, BMEdge *starte)
 {
 	EPath *path;
 	EPathNode *node;
@@ -644,7 +644,7 @@ EPath *edge_path_new(PathBase *pb, BMVert *start, BMEdge *starte)
 	return path;
 }
 
-float edge_weight_path(EPath *path, EdgeData *edata, VertData *UNUSED(vdata))
+static float edge_weight_path(EPath *path, EdgeData *edata, VertData *UNUSED(vdata))
 {
 	EPathNode *node, *first=path->nodes.first;
 	float w = 0.0;
@@ -666,7 +666,7 @@ float edge_weight_path(EPath *path, EdgeData *edata, VertData *UNUSED(vdata))
 }
 
 
-void edge_free_path(PathBase *pathbase, EPath *path)
+static void edge_free_path(PathBase *pathbase, EPath *path)
 {
 	EPathNode *node, *next;
 
@@ -678,7 +678,7 @@ void edge_free_path(PathBase *pathbase, EPath *path)
 	BLI_mempool_free(pathbase->pathpool, path);
 }
 
-EPath *edge_find_shortest_path(BMesh *bm, BMOperator *op, BMEdge *edge, EdgeData *edata, 
+static EPath *edge_find_shortest_path(BMesh *bm, BMOperator *op, BMEdge *edge, EdgeData *edata, 
 								VertData *vdata, PathBase *pathbase, int group)
 {
 	BMEdge *e, *starte;
@@ -965,7 +965,7 @@ void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
 	MEM_freeN(vdata);
 }
 
-BMEdge *edge_next(BMesh *bm, BMEdge *e)
+static BMEdge *edge_next(BMesh *bm, BMEdge *e)
 {
 	BMIter iter;
 	BMEdge *e2;
diff --git a/source/blender/bmesh/operators/edgesplitop.c b/source/blender/bmesh/operators/edgesplitop.c
index 2ca74ac2268..9e82ea9e1ae 100644
--- a/source/blender/bmesh/operators/edgesplitop.c
+++ b/source/blender/bmesh/operators/edgesplitop.c
@@ -44,6 +44,8 @@
 #include "mesh_intern.h"
 #include "subdivideop.h"
 
+#include "bmesh_operators_private.h" /* own include */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -120,7 +122,7 @@ static BMFace *remake_face(BMesh *bm, EdgeTag *etags, BMFace *f, BMVert **verts)
 	return f2;
 }
 
-void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op))
+static void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op))
 {
 	EdgeTag *et;
 	BMIter iter;
diff --git a/source/blender/bmesh/operators/join_triangles.c b/source/blender/bmesh/operators/join_triangles.c
index b5811924cda..73c98f13c10 100644
--- a/source/blender/bmesh/operators/join_triangles.c
+++ b/source/blender/bmesh/operators/join_triangles.c
@@ -27,6 +27,8 @@
 
 #include "bmesh.h"
 
+#include "bmesh_operators_private.h" /* own include */
+
 /*
  * JOIN_TRIANGLES.C
  *
diff --git a/source/blender/bmesh/operators/mirror.c b/source/blender/bmesh/operators/mirror.c
index d73fac47214..e8a18782abd 100644
--- a/source/blender/bmesh/operators/mirror.c
+++ b/source/blender/bmesh/operators/mirror.c
@@ -27,6 +27,7 @@
 #include "BLI_utildefines.h"
 
 #include "bmesh.h"
+#include "bmesh_operators_private.h" /* own include */
 
 /*
  * MIRROR.C
diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/primitiveops.c
index 74ca74f86e3..e05fe7fe3da 100644
--- a/source/blender/bmesh/operators/primitiveops.c
+++ b/source/blender/bmesh/operators/primitiveops.c
@@ -68,10 +68,10 @@ static short icoface[20][3] = {
 // this hack is only used so that scons+mingw + split-sources hack works
 	// ------------------------------- start copied code
 /* these are not the monkeys you are looking for */
-int monkeyo= 4;
-int monkeynv= 271;
-int monkeynf= 250;
-signed char monkeyv[271][3]= {
+static int monkeyo= 4;
+static int monkeynv= 271;
+static int monkeynf= 250;
+static signed char monkeyv[271][3]= {
 {-71,21,98},{-63,12,88},{-57,7,74},{-82,-3,79},{-82,4,92},
 {-82,17,100},{-92,21,102},{-101,12,95},{-107,7,83},
 {-117,31,84},{-109,31,95},{-96,31,102},{-92,42,102},
@@ -142,7 +142,7 @@ signed char monkeyv[271][3]= {
 {-26,-16,-42},{-17,49,-49},
 };
 
-signed char monkeyf[250][4]= {
+static signed char monkeyf[250][4]= {
 {27,4,5,26}, {25,4,5,24}, {3,6,5,4}, {1,6,5,2}, {5,6,7,4}, 
 {3,6,7,2}, {5,8,7,6}, {3,8,7,4}, {7,8,9,6}, 
 {5,8,9,4}, {7,10,9,8}, {5,10,9,6}, {9,10,11,8}, 
diff --git a/source/blender/bmesh/operators/removedoubles.c b/source/blender/bmesh/operators/removedoubles.c
index 3bd894c63b9..0110cab1a34 100644
--- a/source/blender/bmesh/operators/removedoubles.c
+++ b/source/blender/bmesh/operators/removedoubles.c
@@ -23,7 +23,7 @@
 
 #define BL(ptr) ((BMLoop*)(ptr))
 
-void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
+static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
 {
 	BMIter liter;
 	BMLoop *l;
@@ -383,7 +383,7 @@ void bmesh_collapse_exec(BMesh *bm, BMOperator *op)
 }
 
 /*uv collapse function*/
-void bmesh_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer)
+static void bmesh_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer)
 {
 	BMIter iter, liter;
 	BMFace *f;
diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c
index 505faf9b1dc..25b9cd933f3 100644
--- a/source/blender/bmesh/operators/subdivideop.c
+++ b/source/blender/bmesh/operators/subdivideop.c
@@ -141,7 +141,7 @@ for (i=0; i<lvl; i++, df /= 4.0f) {
 #endif
 /*connects face with smallest len, which I think should always be correct for
   edge subdivision*/
-BMEdge *connect_smallest_face(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **nf) {
+static BMEdge *connect_smallest_face(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **nf) {
 	BMIter iter, iter2;
 	BMVert *v;
 	BMLoop *nl;
@@ -382,7 +382,7 @@ static void quad_1edge_split(BMesh *bm, BMFace *UNUSED(face),
 	}
 }
 
-subdpattern quad_1edge = {
+static subdpattern quad_1edge = {
 	{1, 0, 0, 0},
 	quad_1edge_split,
 	4,
@@ -411,7 +411,7 @@ static void quad_2edge_split_path(BMesh *bm, BMFace *UNUSED(face), BMVert **vert
 	connect_smallest_face(bm, verts[numcuts*2+3], verts[numcuts*2+1], &nf);
 }
 
-subdpattern quad_2edge_path = {
+static subdpattern quad_2edge_path = {
 	{1, 1, 0, 0},
 	quad_2edge_split_path,
 	4,
@@ -452,7 +452,7 @@ static void quad_2edge_split_innervert(BMesh *bm, BMFace *UNUSED(face), BMVert *
 	connect_smallest_face(bm, lastv, verts[numcuts*2+2], &nf);	
 }
 
-subdpattern quad_2edge_innervert = {
+static subdpattern quad_2edge_innervert = {
 	{1, 1, 0, 0},
 	quad_2edge_split_innervert,
 	4,
@@ -485,7 +485,7 @@ static void quad_2edge_split_fan(BMesh *bm, BMFace *UNUSED(face), BMVert **verts
 	}
 }
 
-subdpattern quad_2edge_fan = {
+static subdpattern quad_2edge_fan = {
 	{1, 1, 0, 0},
 	quad_2edge_split_fan,
 	4,
@@ -525,7 +525,7 @@ static void quad_3edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
 	}
 }
 
-subdpattern quad_3edge = {
+static subdpattern quad_3edge = {
 	{1, 1, 1, 0},
 	quad_3edge_split,
 	4,
@@ -632,7 +632,7 @@ static void tri_1edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
 	}
 }
 
-subdpattern tri_1edge = {
+static subdpattern tri_1edge = {
 	{1, 0, 0},
 	tri_1edge_split,
 	3,
@@ -732,20 +732,20 @@ cleanup:
 	MEM_freeN(lines);
 }
 
-subdpattern tri_3edge = {
+static subdpattern tri_3edge = {
 	{1, 1, 1},
 	tri_3edge_subdivide,
 	3,
 };
 
 
-subdpattern quad_4edge = {
+static subdpattern quad_4edge = {
 	{1, 1, 1, 1},
 	quad_4edge_subdivide,
 	4,
 };
 
-subdpattern *patterns[] = {
+static subdpattern *patterns[] = {
 	NULL, //quad single edge pattern is inserted here
 	NULL, //quad corner vert pattern is inserted here
 	NULL, //tri single edge pattern is inserted here
diff --git a/source/blender/bmesh/operators/utils.c b/source/blender/bmesh/operators/utils.c
index 0529e4ae212..dc0a692fb3f 100644
--- a/source/blender/bmesh/operators/utils.c
+++ b/source/blender/bmesh/operators/utils.c
@@ -26,6 +26,8 @@
 
 #include "bmesh.h"
 
+#include "bmesh_operators_private.h" /* own include */
+
 /*
  * UTILS.C
  *
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 245f78c5054..4b458969b91 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -408,7 +408,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 			case TH_PIN:
 				cp= ts->pin; break;
 			case TH_PIN_OPAC:
-				cp= &ts->pin_opac; break; /*XXX BMESH_TODO*/
+				//cp= &ts->pin_opac; break; /*XXX BMESH_TODO*/
 					
 			case TH_PREVIEW_BACK:
 				cp= ts->preview_back;
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c
index 45853c2d750..c9126bd4f51 100644
--- a/source/blender/editors/mesh/bmesh_select.c
+++ b/source/blender/editors/mesh/bmesh_select.c
@@ -97,7 +97,7 @@ BMEditMesh_mods.c, UI level access, no geometry changes
 
 /* ****************************** MIRROR **************** */
 
-void EDBM_select_mirrored(Object *obedit, BMEditMesh *em)
+static void EDBM_select_mirrored(Object *obedit, BMEditMesh *em)
 {
 	if(em->selectmode & SCE_SELECT_VERTEX) {
 		BMVert *eve, *v1;
@@ -439,7 +439,7 @@ BMVert *EDBM_findnearestvert(ViewContext *vc, int *dist, short sel, short strict
 }
 
 /* returns labda for closest distance v1 to line-piece v2-v3 */
-float labda_PdistVL2Dfl( float *v1, float *v2, float *v3) 
+float labda_PdistVL2Dfl(const float v1[3], const float v2[3], const float v3[3])
 {
 	float rc[2], len;
 	
@@ -1869,7 +1869,7 @@ void em_deselect_nth_vert(EditMesh *em, int nth, EditVert *eve_act)
 }
 #endif
 
-int EM_deselect_nth(BMEditMesh *em, int nth)
+static int EM_deselect_nth(BMEditMesh *em, int nth)
 {
 #if 1 /*BMESH_TODO*/
 	(void)em;
@@ -2308,7 +2308,7 @@ static int loop_find_region(BMEditMesh *em, BMLoop *l, int flag,
 	return BLI_array_count(region);
 }
 
-int verg_radial(const void *va, const void *vb)
+static int verg_radial(const void *va, const void *vb)
 {
 	BMEdge *e1 = *((void**)va);
 	BMEdge *e2 = *((void**)vb);
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 115e3bda00f..eae283ea9e0 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -175,7 +175,7 @@ void MESH_OT_subdivide(wmOperatorType *ot)
 
 /* individual face extrude */
 /* will use vertex normals for extrusion directions, so *nor is unaffected */
-short EDBM_Extrude_face_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
+static short EDBM_Extrude_face_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
 {
 	BMOIter siter;
 	BMIter liter;
@@ -293,7 +293,7 @@ short EDBM_Extrude_face_indiv(BMEditMesh *em, wmOperator *op, short flag, float
 #endif
 
 /* extrudes individual edges */
-short EDBM_Extrude_edges_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
+static short EDBM_Extrude_edges_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
 {
 	BMOperator bmop;
 
@@ -377,7 +377,7 @@ short EDBM_Extrude_edges_indiv(BMEditMesh *em, short flag, float *nor)
 #endif
 
 /* extrudes individual vertices */
-short EDBM_Extrude_verts_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
+static short EDBM_Extrude_verts_indiv(BMEditMesh *em, wmOperator *op, short flag, float *UNUSED(nor)) 
 {
 	BMOperator bmop;
 
@@ -394,7 +394,7 @@ short EDBM_Extrude_verts_indiv(BMEditMesh *em, wmOperator *op, short flag, float
 	return 'g'; // g is grab
 }
 
-short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, int flag, float *nor)
+static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, int flag, float *nor)
 {
 	BMesh *bm = em->bm;
 	BMIter iter;
@@ -493,7 +493,7 @@ short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, int flag, float *nor)
 	return 'n'; // normal constraint 
 
 }
-short EDBM_Extrude_vert(Object *obedit, BMEditMesh *em, short flag, float *nor)
+static short EDBM_Extrude_vert(Object *obedit, BMEditMesh *em, short flag, float *nor)
 {
 		BMIter iter;
 		BMEdge *eed;
@@ -584,7 +584,7 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
 }
 
 /* generic extern called extruder */
-int EDBM_Extrude_Mesh(Scene *scene, Object *obedit, BMEditMesh *em, wmOperator *op, float *norin)
+static int EDBM_Extrude_Mesh(Scene *scene, Object *obedit, BMEditMesh *em, wmOperator *op, float *norin)
 {
 	short nr, transmode= 0;
 	float stacknor[3] = {0.0f, 0.0f, 0.0f};
@@ -1132,7 +1132,7 @@ static int mesh_selection_type_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void MESH_OT_selection_type(wmOperatorType *ot)
+static void MESH_OT_selection_type(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Selection Mode";
@@ -1896,7 +1896,7 @@ void MESH_OT_bm_test(wmOperatorType *ot)
 
 /********************** Smooth/Solid Operators *************************/
 
-void mesh_set_smooth_faces(BMEditMesh *em, short smooth)
+static void mesh_set_smooth_faces(BMEditMesh *em, short smooth)
 {
 	BMIter iter;
 	BMFace *efa;
@@ -2459,7 +2459,7 @@ typedef struct PathEdge {
 
 
 
-int select_vertex_path_exec(bContext *C, wmOperator *op)
+static int select_vertex_path_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = CTX_data_edit_object(C);
 	BMEditMesh *em = ((Mesh*)ob->data)->edit_btmesh;
@@ -4106,7 +4106,7 @@ void MESH_OT_screw(wmOperatorType *ot)
 	RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX);
 }
 
-int select_by_number_vertices_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
+static int select_by_number_vertices_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
 {
 #if 0
 	Object *obedit= CTX_data_edit_object(C);
@@ -4168,7 +4168,7 @@ void MESH_OT_select_by_number_vertices(wmOperatorType *ot)
 
 #define MIRROR_THRESH	1.0f
 
-int select_mirror_exec(bContext *C, wmOperator *op)
+static int select_mirror_exec(bContext *C, wmOperator *op)
 {
 	
 	Object *obedit= CTX_data_edit_object(C);
diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c
index 228a887a63c..fd97f08b3e7 100644
--- a/source/blender/editors/mesh/bmeshutils.c
+++ b/source/blender/editors/mesh/bmeshutils.c
@@ -430,7 +430,7 @@ void EDBM_selectmode_flush(BMEditMesh *em)
 
 /*EDBM_select_[more/less] are api functions, I think the uv editor
   uses them? though the select more/less ops themselves do not.*/
-void EDBM_select_more(BMEditMesh *em)
+static void EDBM_select_more(BMEditMesh *em)
 {
 	BMOperator bmop;
 	int usefaces = em->selectmode > SCE_SELECT_EDGE;
@@ -445,7 +445,7 @@ void EDBM_select_more(BMEditMesh *em)
 	EDBM_selectmode_flush(em);
 }
 
-void EDBM_select_less(BMEditMesh *em)
+static void EDBM_select_less(BMEditMesh *em)
 {
 	BMOperator bmop;
 	int usefaces = em->selectmode > SCE_SELECT_EDGE;
diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c
index 52e3d1bde6d..1481b0a4cc2 100644
--- a/source/blender/editors/mesh/editbmesh_bvh.c
+++ b/source/blender/editors/mesh/editbmesh_bvh.c
@@ -652,7 +652,7 @@ static BMFace *edge_ray_cast(BMBVHTree *tree, float *co, float *dir, float *hito
 	return f;
 }
 
-void scale_point(float *c1, float *p, float s)
+static void scale_point(float *c1, float *p, float s)
 {
 	sub_v3_v3(c1, p);
 	mul_v3_fl(c1, s);
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 80651b301ab..bd63b518142 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -148,7 +148,7 @@ static int facesel_face_pick(struct bContext *C, Mesh *me, Object *ob, const sho
 
 /* last_sel, use em->act_face otherwise get the last selected face in the editselections
  * at the moment, last_sel is mainly useful for gaking sure the space image dosnt flicker */
-MTexPoly *EDBM_get_active_mtface(BMEditMesh *em, BMFace **act_efa, int sloppy)
+static MTexPoly *EDBM_get_active_mtface(BMEditMesh *em, BMFace **act_efa, int sloppy)
 {
 	BMFace *efa = NULL;
 	
@@ -387,7 +387,7 @@ void paintface_deselect_all_visible(Object *ob, int action, short UNUSED(flush_f
 // XXX notifier!		object_tface_flags_changed(OBACT, 0);
 }
 
-void selectswap_tface(Scene *scene)
+static void selectswap_tface(Scene *scene)
 {
 	Mesh *me;
 	MPoly *mface;
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c
index ca197194a97..f702f1613c5 100755
--- a/source/blender/editors/mesh/knifetool.c
+++ b/source/blender/editors/mesh/knifetool.c
@@ -187,7 +187,7 @@ typedef struct knifetool_opdata {
 
 static ListBase *knife_get_face_kedges(knifetool_opdata *kcd, BMFace *f);
 
-void knife_project_v3(knifetool_opdata *kcd, float co[3], float sco[3])
+static void knife_project_v3(knifetool_opdata *kcd, float co[3], float sco[3])
 {
 	if (kcd->is_ortho) {
 		mul_v3_m4v3(sco, kcd->projmat, co);
@@ -318,7 +318,7 @@ static ListBase *knife_get_face_kedges(knifetool_opdata *kcd, BMFace *f)
 }
 
 /*finds the proper face to restrict face fill to*/
-void knife_find_basef(knifetool_opdata *kcd, KnifeEdge *kfe)
+static void knife_find_basef(knifetool_opdata *kcd, KnifeEdge *kfe)
 {
 	if (!kfe->basef) {
 		Ref *r1, *r2, *r3, *r4;
@@ -730,7 +730,7 @@ static void knifetool_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void
 	glEnable(GL_DEPTH_TEST);
 }
 
-void _print_smhash(SmallHash *hash)
+static void _print_smhash(SmallHash *hash)
 {
 	int i, linecol=79, c=0;
 	
@@ -779,7 +779,7 @@ static int point_on_line(float p[3], float v1[3], float v2[3])
 	return 0;
 }
 
-BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, float v1[3], 
+static BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, float v1[3], 
                               float v2[3], float v3[3], SmallHash *ehash, bglMats *mats, int *count)
 {
 	BVHTree *tree2 = BLI_bvhtree_new(3, FLT_EPSILON*4, 8, 8), *tree = BMBVH_BVHTree(bmtree);
@@ -891,7 +891,7 @@ BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, float
 	return edges;
 }
 
-void knife_bgl_get_mats(knifetool_opdata *UNUSED(kcd), bglMats *mats)
+static void knife_bgl_get_mats(knifetool_opdata *UNUSED(kcd), bglMats *mats)
 {
 	bgl_get_mats(mats);
 	//copy_m4_m4(mats->modelview, kcd->vc.rv3d->viewmat);
@@ -1127,7 +1127,6 @@ static KnifeEdge *knife_find_closest_edge(knifetool_opdata *kcd, float p[3], BMF
 			dis = dist_to_line_segment_v2(sco, kfe->v1->sco, kfe->v2->sco);
 			if (dis < curdis && dis < maxdist) {
 				if(kcd->vc.rv3d->rflag & RV3D_CLIPPING) {
-					float labda_PdistVL2Dfl(float *v1, float *v2, float *v3);
 					float labda= labda_PdistVL2Dfl(sco, kfe->v1->sco, kfe->v2->sco);
 					float vec[3];
 		
@@ -1370,7 +1369,7 @@ static void remerge_faces(knifetool_opdata *kcd)
 }
 
 /*use edgenet to fill faces.  this is a bit annoying and convoluted.*/
-void knifenet_fill_faces(knifetool_opdata *kcd)
+static void knifenet_fill_faces(knifetool_opdata *kcd)
 {
 	BMesh *bm = kcd->em->bm;
 	BMIter bmiter;
@@ -1640,7 +1639,7 @@ static int project_knife_view_clip(View3D *v3d, RegionView3D *rv3d, float *clips
 	return orth;
 }
 
-void knife_recalc_projmat(knifetool_opdata *kcd)
+static void knife_recalc_projmat(knifetool_opdata *kcd)
 {
 	ARegion *ar = CTX_wm_region(kcd->C);
 	
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 418860a4805..e7290601372 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -95,6 +95,9 @@ void EDBM_validate_selections(struct BMEditMesh *em);
 void EDBM_remove_selection(struct BMEditMesh *em, void *data);
 void EDBM_stats_update(struct BMEditMesh *em);
 
+/* TODO, move to math_geometry.c */
+float labda_PdistVL2Dfl(const float v1[3], const float v2[3], const float v3[3]);
+
 /* ******************** editface.c */
 
 int edgetag_context_check(Scene *scene, BMEditMesh *em, BMEdge *eed);
@@ -227,6 +230,7 @@ void MESH_OT_mark_seam(struct wmOperatorType *ot);
 void MESH_OT_mark_sharp(struct wmOperatorType *ot);
 void MESH_OT_vertices_smooth(struct wmOperatorType *ot);
 void MESH_OT_noise(struct wmOperatorType *ot);
+void EXPORT_MESH_OT_wavefront(struct wmOperatorType *ot);
 void MESH_OT_flip_normals(struct wmOperatorType *ot);
 void MESH_OT_solidify(struct wmOperatorType *ot);
 void MESH_OT_select_nth(struct wmOperatorType *ot);
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 49b9516190a..24716e639f9 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -1192,7 +1192,7 @@ BMVert *editbmesh_get_x_mirror_vert(Object *ob, struct BMEditMesh *em, BMVert *e
 
 
 
-float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float *mirrCent, float *face_cent)
+static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float *mirrCent, float *face_cent)
 {
 	float vec[2];
 	float cent_vec[2];
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index ebbe2fced62..1269342b3e0 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -156,7 +156,7 @@ void view3d_get_transformation(ARegion *ar, RegionView3D *rv3d, Object *ob, bglM
 
 /* local prototypes */
 
-void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select)
+static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select)
 {
 	BMVert *eve;
 	BMIter iter;
@@ -172,7 +172,7 @@ void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select)
 	}
 }
 
-void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select)
+static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select)
 {
 	BMEdge *eed;
 	BMIter iter;
@@ -188,7 +188,7 @@ void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select)
 	}
 }
 
-void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
+static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
 {
 	BMFace *efa;
 	BMIter iter;
@@ -204,7 +204,7 @@ void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
 	}
 }
 
-void EDBM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
+static void EDBM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
 {
 	MPoly *mpoly = me->mpoly;
 	int a;