Index: stream/cache2.h
===================================================================
--- stream/cache2.h	(revision 0)
+++ stream/cache2.h	(revision 0)
@@ -0,0 +1,6 @@
+#ifndef _cache2_h
+#define _cache2_h
+
+extern void cache_uninit(stream_t *s);
+
+#endif
Index: stream/stream.c
===================================================================
--- stream/stream.c	(revision 19631)
+++ stream/stream.c	(working copy)
@@ -31,9 +31,8 @@
 #include "m_option.h"
 #include "m_struct.h"
 
+#include "cache2.h"
 
-void cache_uninit(stream_t *s); // defined in cache2.c
-
 //#include "vcd_read_bincue.h"
 
 #ifdef HAVE_VCD
Index: parser-cfg.h
===================================================================
--- parser-cfg.h	(revision 0)
+++ parser-cfg.h	(revision 0)
@@ -0,0 +1,6 @@
+#ifndef _parser_cfg_h
+#define _parser_cfg_h
+
+extern int m_config_parse_config_file(m_config_t* config, char *conffile);
+
+#endif
Index: parser-mpcmd.h
===================================================================
--- parser-mpcmd.h	(revision 0)
+++ parser-mpcmd.h	(revision 0)
@@ -0,0 +1,6 @@
+#ifndef _parser_mpcmd_h
+#define _parser_mpcmd_h
+
+extern play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
+
+#endif
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 19631)
+++ mplayer.c	(working copy)
@@ -85,7 +85,6 @@
 
 int slave_mode=0;
 int player_idle_mode=0;
-extern int verbose;
 int quiet=0;
 
 #ifdef WIN32
@@ -116,7 +115,7 @@
 #include "stream/dvbin.h"
 static int last_dvb_step = 1;
 static int dvbin_reopen = 0;
-extern void cache_uninit(stream_t *s);
+#include "stream/cache2.h"
 #endif
 
 //**************************************************************************//
@@ -144,13 +143,11 @@
 //**************************************************************************//
 //             Config
 //**************************************************************************//
+#include "parser-cfg.h"
+#include "parser-mpcmd.h"
+
 m_config_t* mconfig;
 
-extern play_tree_t*
-m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
-extern int
-m_config_parse_config_file(m_config_t* config, char *conffile);
-
 //**************************************************************************//
 //             Config file
 //**************************************************************************//
@@ -194,8 +191,6 @@
 #include "libmpcodecs/vf.h"
 #include "libmpcodecs/vd.h"
 
-extern void vf_list_plugins(void);
-
 //**************************************************************************//
 //**************************************************************************//
 
@@ -805,8 +800,6 @@
   exit_player(NULL);
 }
 
-//extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
-
 extern void mp_input_register_options(m_config_t* cfg);
 
 #include "mixer.h"
Index: osdep/getch2.h
===================================================================
--- osdep/getch2.h	(revision 19631)
+++ osdep/getch2.h	(working copy)
@@ -21,3 +21,6 @@
 /* Read a character or a special key code (see keycodes.h) */
 extern int getch2(int halfdelay_time);
 
+#ifdef __MINGW32__
+extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
+#endif