10 files changed, 18 insertions, 11 deletions
diff --git a/source/blender/include/BDR_drawmesh.h b/source/blender/include/BDR_drawmesh.h
index 6bb1dea3396..a6727198b23 100644
--- a/source/blender/include/BDR_drawmesh.h
+++ b/source/blender/include/BDR_drawmesh.h
@@ -67,7 +67,7 @@ int get_linear_mipmap(void);
 /**
  * Resets the realtime image cache variables.
  */
-void clear_realtime_image_cache();
+void clear_realtime_image_cache(void);
 
 void free_realtime_image(struct Image *ima);
 void free_all_realtime_images(void);
diff --git a/source/blender/include/BDR_unwrapper.h b/source/blender/include/BDR_unwrapper.h
index a75c85ac1ce..ffb1c6b7c5c 100644
--- a/source/blender/include/BDR_unwrapper.h
+++ b/source/blender/include/BDR_unwrapper.h
@@ -33,9 +33,9 @@
 #ifndef BDR_UNWRAPPER_H
 #define BDR_UNWRAPPER_H
 
-void set_seamtface(); /* set TF_SEAM flags in tfaces */
-void unwrap_lscm(); /* unwrap selected tfaces */
-void select_linked_tfaces_with_seams();
+void set_seamtface(void); /* set TF_SEAM flags in tfaces */
+void unwrap_lscm(void); /* unwrap selected tfaces */
+void select_linked_tfaces_with_seams(void);
 
 #endif /* BDR_UNWRAPPER_H */
 
diff --git a/source/blender/include/BIF_editfont.h b/source/blender/include/BIF_editfont.h
index 4614403f52c..fe3604493f5 100644
--- a/source/blender/include/BIF_editfont.h
+++ b/source/blender/include/BIF_editfont.h
@@ -42,6 +42,7 @@ void remake_editText(void);
 void free_editText(void);
 void paste_editText(void);
 void txt_export_to_object(struct Text *text);
+void txt_export_to_objects(struct Text *text);
 void undo_push_font(char *);
 
 /**
diff --git a/source/blender/include/BIF_editview.h b/source/blender/include/BIF_editview.h
index f1f918b83fd..1cbee01f99b 100644
--- a/source/blender/include/BIF_editview.h
+++ b/source/blender/include/BIF_editview.h
@@ -41,7 +41,7 @@ void	borderselect(void);
 void	circle_select(void);
 void	deselectall(void);
 void selectall_type(short obtype);
-void selectall_layer(int layernum);
+void selectall_layer(unsigned int layernum);
 void	draw_sel_circle(short *mval, short *mvalo, float rad, float rado, int selecting);
 void	fly(void);
 int		gesture(void);
diff --git a/source/blender/include/BIF_fsmenu.h b/source/blender/include/BIF_fsmenu.h
index 50b671c6f3d..b32dee01854 100644
--- a/source/blender/include/BIF_fsmenu.h
+++ b/source/blender/include/BIF_fsmenu.h
@@ -40,7 +40,7 @@ int		fsmenu_get_nentries		(void);
 	/** Returns true if the fsmenu entry at @a index exists and
 	 * is a seperator.
 	 */
-char*	fsmenu_is_entry_a_seperator	(int index);
+int	fsmenu_is_entry_a_seperator	(int index);
 
 	/** Returns the fsmenu entry at @a index (or NULL if a bad index)
      * or a seperator.
diff --git a/source/blender/include/BIF_mywindow.h b/source/blender/include/BIF_mywindow.h
index 40896eec8ff..e365b6a9b6e 100644
--- a/source/blender/include/BIF_mywindow.h
+++ b/source/blender/include/BIF_mywindow.h
@@ -85,6 +85,7 @@ void bwin_load_winmatrix(int winid, float mat[][4]);
 void bwin_get_viewmatrix(int winid, float mat[][4]);
 void bwin_get_winmatrix(int winid, float mat[][4]);
 
+void bwin_multmatrix(int winid, float mat[][4]);
 void bwin_scalematrix(int winid, float x, float y, float z);
 
 void bwin_ortho(int winid, float x1, float x2, float y1, float y2, float n, float f);
diff --git a/source/blender/include/BIF_oops.h b/source/blender/include/BIF_oops.h
index bf08e9f1380..5da088a5ea7 100644
--- a/source/blender/include/BIF_oops.h
+++ b/source/blender/include/BIF_oops.h
@@ -41,12 +41,14 @@ struct Material;
 struct Mesh;
 struct MetaBall;
 struct Object;
+struct Lamp;
 void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag);
 void add_from_link(struct Oops *from, struct Oops *oops);
 void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag);
 void add_mball_oopslinks(struct MetaBall *mb, struct Oops *oops, short flag);
 void add_mesh_oopslinks(struct Mesh *me, struct Oops *oops, short flag);
 void add_object_oopslinks(struct Object *ob, struct Oops *oops, short flag);
+void add_lamp_oopslinks(struct Lamp *la, struct Oops *oops, short flag);
 struct Oops *add_oops(void *id);
 struct OopsLink *add_oopslink(char *name, struct Oops *oops, short type, void *from, float xof, float yof);
 struct Oops *add_test_oops(void *id);	/* incl links */
diff --git a/source/blender/include/BIF_transform.h b/source/blender/include/BIF_transform.h
index d79753a71f8..5b4ef3e113e 100755
--- a/source/blender/include/BIF_transform.h
+++ b/source/blender/include/BIF_transform.h
@@ -65,10 +65,10 @@ void Transform(int mode);
 
 struct TransInfo;
 
-struct TransInfo * BIF_GetTransInfo();
+struct TransInfo * BIF_GetTransInfo(void);
 void BIF_setSingleAxisConstraint(float vec[3]);
-void BIF_drawConstraint();
-void BIF_drawPropCircle();
+void BIF_drawConstraint(void);
+void BIF_drawPropCircle(void);
 
 #endif
 
diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h
index c98f75e9a43..e7c2e1c9320 100644
--- a/source/blender/include/BSE_drawview.h
+++ b/source/blender/include/BSE_drawview.h
@@ -65,5 +65,8 @@ void end_anim_sumo(void);
 void inner_play_anim_loop(int init, int mode);
 int play_anim(int mode);
 
+
+void make_axis_color(char *col, char *col2, char axis);
+
 #endif /* BSE_DRAWVIEW_H */
 
diff --git a/source/blender/include/BSE_headerbuttons.h b/source/blender/include/BSE_headerbuttons.h
index 8642f2b7635..562f17609ae 100644
--- a/source/blender/include/BSE_headerbuttons.h
+++ b/source/blender/include/BSE_headerbuttons.h
@@ -66,8 +66,8 @@ struct Scene *copy_scene(struct Scene *sce, int level);
 
 void buttons_active_id(struct ID **id, struct ID **idfrom);
 
-int start_progress_bar();
-void end_progress_bar();
+int start_progress_bar(void);
+void end_progress_bar(void);
 int progress_bar(float done, char *busy_info);
 
 void update_for_newframe(void);