more header / declaration cleanups; fixes a lot of warnings as well as a preempt to removal of redundant wincfg.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26225 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 8 insertions, 13 deletions

diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index 7793fc6894..29d5faaf31 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -23,7 +23,7 @@
 
 #include <windows.h>
 #include <commctrl.h>
-
+#include <get_path.h>
 #include "interface.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -31,7 +31,6 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "gui.h"
-#include "wincfg.h"
 #include "dialogs.h"
 #include "libvo/sub.h"
 
diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index 428a24dfcc..20eaf0d887 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -41,7 +41,6 @@
 #include "libvo/video_out.h"
 #include "interface.h"
 #include "gui.h"
-#include "wincfg.h"
 #include "dialogs.h"
 
 // HACK around bug in old mingw
@@ -57,9 +56,7 @@
 /* Globals / Externs */
 extern void renderinfobox(skin_t *skin, window_priv_t *priv);
 extern void renderwidget(skin_t *skin, image *dest, widget *item, int state);
-extern void mplayer_put_key(int code);
 extern void print_version(void);
-extern int WinID;
 float sub_aspect;
 
 DWORD oldtime;
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index b97bc97c69..bf5a44a8cb 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -35,7 +35,8 @@ extern char *skinName;
 extern float sub_aspect;
 extern play_tree_t* playtree;
 extern m_config_t* mconfig;
-
+extern int sub_window;
+extern int console;
 extern NOTIFYICONDATA nid;
 
 typedef struct window_priv_t window_priv_t;
diff --git a/gui/win32/interface.c b/gui/win32/interface.c
index ee360c883d..6039276dc1 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -22,7 +22,7 @@
  */
 
 #include <windows.h>
-
+#include <get_path.h>
 #include "interface.h"
 #include "m_option.h"
 #include "mixer.h"
@@ -41,7 +41,6 @@
 #include "access_mpcontext.h"
 #include "gui.h"
 #include "dialogs.h"
-#include "wincfg.h"
 #ifdef HAVE_LIBCDIO
 #include <cdio/cdio.h>
 #endif
diff --git a/gui/win32/playlist.c b/gui/win32/playlist.c
index 1ccebab432..d11e178087 100644
--- a/gui/win32/playlist.c
+++ b/gui/win32/playlist.c
@@ -22,7 +22,7 @@
  */
 
 #include <windows.h>
-
+#include <stdio.h>
 #include "mp_msg.h"
 #include "playlist.h"
 
diff --git a/gui/win32/preferences.c b/gui/win32/preferences.c
index 08cabd00c1..39c6f74163 100644
--- a/gui/win32/preferences.c
+++ b/gui/win32/preferences.c
@@ -35,7 +35,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "dialogs.h"
-#include "wincfg.h"
 
 extern char  *proc_priority;
 
diff --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index ec4ad08657..eed8b30c44 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -21,9 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <windows.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <get_path.h>
 #include "mplayer.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -31,8 +32,8 @@
 #include "m_option.h"
 #include "libvo/video_out.h"
 #include "mixer.h"
-#include "wincfg.h"
 #include "interface.h"
+#include "gui.h"
 
 /* params */
 int   gtkAONorm = 0;
@@ -53,7 +54,6 @@ int gui_sub_pos_x = -1;
 int gui_sub_pos_y = -1;
 
 /* External functions */
-extern int frame_dropping;
 extern char *proc_priority;
 extern int m_config_parse_config_file(m_config_t *config, char *conffile);