diff -r bd6d194199e5 tools/libfsimage/ext2fs/fsys_ext2fs.c
--- a/tools/libfsimage/ext2fs/fsys_ext2fs.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c	Tue Jul 15 15:35:09 2008 +0200
@@ -281,7 +281,7 @@ struct ext2_dir_entry
 #define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)
 
 /* check filesystem types and read superblock into memory buffer */
-int
+static int
 ext2fs_mount (fsi_file_t *ffi, const char *options)
 {
   int retval = 1;
@@ -419,7 +419,7 @@ ext2fs_block_map (fsi_file_t *ffi, int l
 }
 
 /* preconditions: all preconds of ext2fs_block_map */
-int
+static int
 ext2fs_read (fsi_file_t *ffi, char *buf, int len)
 {
   int logical_block;
@@ -526,7 +526,7 @@ int ext2_is_fast_symlink (fsi_file_t *ff
  *   inode of the file we were trying to look up
  * side effects: messes up GROUP_DESC buffer area
  */
-int
+static int
 ext2fs_dir (fsi_file_t *ffi, char *dirname)
 {
   int current_ino = EXT2_ROOT_INO;	/* start at the root */
@@ -818,6 +818,9 @@ ext2fs_dir (fsi_file_t *ffi, char *dirna
 }
 
 fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
+
+fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
 {
 	static fsig_plugin_ops_t ops = {
diff -r bd6d194199e5 tools/libfsimage/fat/fsys_fat.c
--- a/tools/libfsimage/fat/fsys_fat.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/fat/fsys_fat.c	Tue Jul 15 15:35:09 2008 +0200
@@ -54,7 +54,7 @@ struct fat_superblock
 
 #define log2 grub_log2
 
-int
+static int
 fat_mount (fsi_file_t *ffi, const char *options)
 {
   struct fat_bpb bpb;
@@ -179,7 +179,7 @@ fat_mount (fsi_file_t *ffi, const char *
   return 1;
 }
 
-int
+static int
 fat_read (fsi_file_t *ffi, char *buf, int len)
 {
   int logical_clust;
@@ -273,7 +273,7 @@ fat_read (fsi_file_t *ffi, char *buf, in
   return errnum ? 0 : ret;
 }
 
-int
+static int
 fat_dir (fsi_file_t *ffi, char *dirname)
 {
   char *rest, ch, dir_buf[FAT_DIRENTRY_LENGTH];
@@ -471,6 +471,9 @@ fat_dir (fsi_file_t *ffi, char *dirname)
 }
 
 fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
+
+fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
 {
 	static fsig_plugin_ops_t ops = {
diff -r bd6d194199e5 tools/libfsimage/iso9660/fsys_iso9660.c
--- a/tools/libfsimage/iso9660/fsys_iso9660.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/iso9660/fsys_iso9660.c	Tue Jul 15 15:35:09 2008 +0200
@@ -101,7 +101,7 @@ iso9660_devread (fsi_file_t *ffi, int se
   return devread(ffi, sector, byte_offset, byte_len, buf);
 }
 
-int
+static int
 iso9660_mount (fsi_file_t *ffi, const char *options)
 {
   unsigned int sector;
@@ -141,7 +141,7 @@ iso9660_mount (fsi_file_t *ffi, const ch
   return 0;
 }
 
-int
+static int
 iso9660_dir (fsi_file_t *ffi, char *dirname)
 {
   struct iso_directory_record *idr;
@@ -413,7 +413,7 @@ iso9660_dir (fsi_file_t *ffi, char *dirn
   return 1;
 }
 
-int
+static int
 iso9660_read (fsi_file_t *ffi, char *buf, int len)
 {
   int sector, blkoffset, size, ret;
@@ -449,6 +449,9 @@ iso9660_read (fsi_file_t *ffi, char *buf
 }
 
 fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
+
+fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
 {
 	static fsig_plugin_ops_t ops = {
diff -r bd6d194199e5 tools/libfsimage/reiserfs/fsys_reiserfs.c
--- a/tools/libfsimage/reiserfs/fsys_reiserfs.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c	Tue Jul 15 15:35:09 2008 +0200
@@ -555,7 +555,7 @@ journal_init (fsi_file_t *ffi)
 }
 
 /* check filesystem types and read superblock into memory buffer */
-int
+static int
 reiserfs_mount (fsi_file_t *ffi, const char *options)
 {
   struct reiserfs_super_block super;
@@ -872,7 +872,7 @@ search_stat (fsi_file_t *ffi, __u32 dir_
   return 0;
 }
 
-int
+static int
 reiserfs_read (fsi_file_t *ffi, char *buf, int len)
 {
   unsigned int blocksize;
@@ -980,7 +980,7 @@ reiserfs_read (fsi_file_t *ffi, char *bu
  *   of the file we were trying to look up, filepos is 0 and filemax is 
  *   the size of the file.
  */
-int
+static int
 reiserfs_dir (fsi_file_t *ffi, char *dirname)
 {
   struct reiserfs_de_head *de_head;
@@ -1202,6 +1202,9 @@ reiserfs_dir (fsi_file_t *ffi, char *dir
 }
 
 int
+reiserfs_embed (fsi_file_t *ffi, int *start_sector, int needed_sectors);
+
+int
 reiserfs_embed (fsi_file_t *ffi, int *start_sector, int needed_sectors)
 {
   struct reiserfs_super_block super;
@@ -1227,6 +1230,9 @@ reiserfs_embed (fsi_file_t *ffi, int *st
 }
 
 fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
+
+fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
 {
 	static fsig_plugin_ops_t ops = {
diff -r bd6d194199e5 tools/libfsimage/ufs/fsys_ufs.c
--- a/tools/libfsimage/ufs/fsys_ufs.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/ufs/fsys_ufs.c	Tue Jul 15 15:35:09 2008 +0200
@@ -44,7 +44,7 @@ static grub_daddr32_t sbmap(fsi_file_t *
 static grub_daddr32_t sbmap(fsi_file_t *, grub_daddr32_t);
 
 /* read superblock and check fs magic */
-int
+static int
 ufs_mount(fsi_file_t *ffi, const char *options)
 {
 	if (/*! IS_PC_SLICE_TYPE_SOLARIS(current_slice) || */
@@ -62,7 +62,7 @@ ufs_mount(fsi_file_t *ffi, const char *o
  * The entry point should really be named ufs_open(char *pathname).
  * For now, keep it consistent with the rest of fsys modules.
  */
-int
+static int
 ufs_dir(fsi_file_t *ffi, char *dirname)
 {
 	grub_ino_t inode = ROOTINO;	/* start from root */
@@ -102,7 +102,7 @@ ufs_dir(fsi_file_t *ffi, char *dirname)
 /*
  * This is the high-level read function.
  */
-int
+static int
 ufs_read(fsi_file_t *ffi, char *buf, int len)
 {
   	int off, size, ret = 0, ok;
@@ -135,6 +135,9 @@ ufs_read(fsi_file_t *ffi, char *buf, int
 
 	return (ret);
 }
+
+int
+ufs_embed (int *start_sector, int needed_sectors);
 
 int
 ufs_embed (int *start_sector, int needed_sectors)
@@ -264,6 +267,9 @@ dlook(fsi_file_t *ffi, grub_ino_t dir_in
 }
 
 fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
+
+fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
 {
 	static fsig_plugin_ops_t ops = {
diff -r bd6d194199e5 tools/libfsimage/zfs/fsys_zfs.c
--- a/tools/libfsimage/zfs/fsys_zfs.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/libfsimage/zfs/fsys_zfs.c	Tue Jul 15 15:35:09 2008 +0200
@@ -1199,7 +1199,7 @@ check_pool_label(fsi_file_t *ffi, int la
  *	1 - success
  *	0 - failure
  */
-int
+static int
 zfs_mount(fsi_file_t *ffi, const char *options)
 {
 	char *stack;
@@ -1284,7 +1284,7 @@ zfs_mount(fsi_file_t *ffi, const char *o
  *	1 - success
  *	0 - failure
  */
-int
+static int
 zfs_open(fsi_file_t *ffi, char *filename)
 {
 	char *stack;
@@ -1377,7 +1377,7 @@ zfs_open(fsi_file_t *ffi, char *filename
  *	len - the length successfully read in to the buffer
  *	0   - failure
  */
-int
+static int
 zfs_read(fsi_file_t *ffi, char *buf, int len)
 {
 	char *stack;
@@ -1437,10 +1437,16 @@ zfs_read(fsi_file_t *ffi, char *buf, int
  * No-Op
  */
 int
+zfs_embed(int *start_sector, int needed_sectors);
+
+int
 zfs_embed(int *start_sector, int needed_sectors)
 {
 	return (1);
 }
+
+fsi_plugin_ops_t *
+fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name);
 
 fsi_plugin_ops_t *
 fsi_init_plugin(int version, fsi_plugin_t *fp, const char **name)
diff -r bd6d194199e5 tools/pygrub/src/fsimage/fsimage.c
--- a/tools/pygrub/src/fsimage/fsimage.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/pygrub/src/fsimage/fsimage.c	Tue Jul 15 15:35:09 2008 +0200
@@ -316,8 +316,9 @@ static struct PyMethodDef fsimage_module
 	{ NULL, NULL, 0, NULL }
 };
 
-PyMODINIT_FUNC
-initfsimage(void)
+PyMODINIT_FUNC initfsimage(void);
+
+PyMODINIT_FUNC initfsimage(void)
 {
 	Py_InitModule("fsimage", fsimage_module_methods);
 }
diff -r bd6d194199e5 tools/python/ptsname/ptsname.c
--- a/tools/python/ptsname/ptsname.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/python/ptsname/ptsname.c	Tue Jul 15 15:35:09 2008 +0200
@@ -38,6 +38,8 @@ static PyMethodDef ptsname_methods[] = {
     { NULL }
 };
 
+PyMODINIT_FUNC initptsname(void);
+
 PyMODINIT_FUNC initptsname(void)
 {
     Py_InitModule("ptsname", ptsname_methods);
diff -r bd6d194199e5 tools/python/xen/lowlevel/acm/acm.c
--- a/tools/python/xen/lowlevel/acm/acm.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/python/xen/lowlevel/acm/acm.c	Tue Jul 15 15:35:09 2008 +0200
@@ -40,7 +40,7 @@ static PyObject *acm_error_obj;
 static PyObject *acm_error_obj;
 
 /* generic shared function */
-void * __getssid(int domid, uint32_t *buflen)
+static void * __getssid(int domid, uint32_t *buflen)
 {
     struct acm_getssid getssid;
     int xc_handle;
@@ -355,6 +355,8 @@ static PyMethodDef acmMethods[] = {
 };
 
 /* inits */
+PyMODINIT_FUNC initacm(void);
+
 PyMODINIT_FUNC initacm(void)
 {
     PyObject *m = Py_InitModule("acm", acmMethods);
diff -r bd6d194199e5 tools/python/xen/lowlevel/flask/flask.c
--- a/tools/python/xen/lowlevel/flask/flask.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/python/xen/lowlevel/flask/flask.c	Tue Jul 15 15:35:09 2008 +0200
@@ -124,6 +124,8 @@ static PyMethodDef pyflask_methods[] = {
     { NULL, NULL, 0, NULL }
 };
 
+PyMODINIT_FUNC initflask(void);
+
 PyMODINIT_FUNC initflask(void)
 {
     Py_InitModule("flask", pyflask_methods);
diff -r bd6d194199e5 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/python/xen/lowlevel/xc/xc.c	Tue Jul 15 15:35:09 2008 +0200
@@ -2000,6 +2000,8 @@ static PyTypeObject PyXcType = {
 
 static PyMethodDef xc_methods[] = { { NULL } };
 
+PyMODINIT_FUNC initxc(void);
+
 PyMODINIT_FUNC initxc(void)
 {
     PyObject *m;
diff -r bd6d194199e5 tools/python/xen/lowlevel/xs/xs.c
--- a/tools/python/xen/lowlevel/xs/xs.c	Tue Jul 15 14:04:02 2008 +0100
+++ b/tools/python/xen/lowlevel/xs/xs.c	Tue Jul 15 15:35:09 2008 +0200
@@ -959,6 +959,8 @@ static PyTypeObject xshandle_type = {
 
 static PyMethodDef xs_methods[] = { { NULL } };
 
+PyMODINIT_FUNC initxs(void);
+
 PyMODINIT_FUNC initxs(void)
 {
     PyObject* m;