6 files changed, 28 insertions, 28 deletions
diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index b750fb9caf..60a8d8c759 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -40,8 +40,8 @@ extern int vo_gamma_brightness;
 extern int vo_gamma_saturation;
 extern int vo_gamma_contrast;
 extern int vo_gamma_hue;
-extern int set_video_colors(sh_video_t *sh_video, const char *item, int value);
-extern int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
+int set_video_colors(sh_video_t *sh_video, const char *item, int value);
+int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
 
 guiInterface_t guiIntfStruct;
 int addurl = 0;
diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index 35268938a6..d9d86f58a3 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -54,9 +54,9 @@
 #endif
 
 /* 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 print_version(void);
+void renderinfobox(skin_t *skin, window_priv_t *priv);
+void renderwidget(skin_t *skin, image *dest, widget *item, int state);
+void print_version(void);
 float sub_aspect;
 
 DWORD oldtime;
@@ -1086,7 +1086,7 @@ static int GetDesktopBitsPerPixel(void)
 }
 
 /* unloads a skin and destroys its windows */
-extern int destroy_window(gui_t *gui)
+int destroy_window(gui_t *gui)
 {
     RECT rd;
     unsigned int i;
@@ -1311,7 +1311,7 @@ static int window_render(gui_t *gui, HWND hWnd, HDC hdc, window_priv_t *priv, wi
 }
 
 /* creates the sub (AKA video) window,*/
-extern int create_subwindow(gui_t *gui, char *skindir)
+int create_subwindow(gui_t *gui, char *skindir)
 {
     HINSTANCE instance = GetModuleHandle(NULL);
     WNDCLASS wc;
@@ -1392,7 +1392,7 @@ extern int create_subwindow(gui_t *gui, char *skindir)
 }
 
 /* loads/updates a skin and creates windows for it */
-extern int create_window(gui_t *gui, char *skindir)
+int create_window(gui_t *gui, char *skindir)
 {
     HINSTANCE instance = GetModuleHandle(NULL);
     WNDCLASS wc;
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index 66d78b0cff..d8578dc96f 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -99,23 +99,23 @@ struct gui_t
 #define     wsMovable       2
 #define     wsSizeable      4
 
-extern gui_t *create_gui(char *skindir, char *skinName, void (*playercontrol)(int event));
-extern int destroy_window(gui_t *gui);
-extern int create_window(gui_t *gui, char *skindir);
-extern int create_subwindow(gui_t *gui, char *skindir);
-extern int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
-extern void capitalize(char *filename);
-extern int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
+gui_t *create_gui(char *skindir, char *skinName, void (*playercontrol)(int event));
+int destroy_window(gui_t *gui);
+int create_window(gui_t *gui, char *skindir);
+int create_subwindow(gui_t *gui, char *skindir);
+int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
+void capitalize(char *filename);
+int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
 
 /* Dialogs */
-extern void display_playlistwindow(gui_t *gui);
-extern void update_playlistwindow(void);
-extern int display_openfilewindow(gui_t *gui, int add);
-extern void display_openurlwindow(gui_t *gui, int add);
-extern void display_skinbrowser(gui_t *gui);
-extern void display_chapterselwindow(gui_t *gui);
-extern void display_eqwindow(gui_t *gui);
-extern void display_prefswindow(gui_t *gui);
-extern void display_opensubtitlewindow(gui_t *gui);
+void display_playlistwindow(gui_t *gui);
+void update_playlistwindow(void);
+int display_openfilewindow(gui_t *gui, int add);
+void display_openurlwindow(gui_t *gui, int add);
+void display_skinbrowser(gui_t *gui);
+void display_chapterselwindow(gui_t *gui);
+void display_eqwindow(gui_t *gui);
+void display_prefswindow(gui_t *gui);
+void display_opensubtitlewindow(gui_t *gui);
 
 #endif /* MPLAYER_GUI_GUI_H */
diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h
index 52aad4144b..8a3fddd41c 100644
--- a/gui/win32/playlist.h
+++ b/gui/win32/playlist.h
@@ -55,7 +55,7 @@ struct playlist_t
 #define SORT_BYTITLE        3
 #define SORT_BYDURATION     4
 
-extern playlist_t *create_playlist(void);
-extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
+playlist_t *create_playlist(void);
+BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
 
 #endif /* MPLAYER_GUI_PLAYLIST_H */
diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h
index e9fac91090..69019d9638 100644
--- a/gui/win32/skinload.h
+++ b/gui/win32/skinload.h
@@ -110,7 +110,7 @@ struct skin_t
     image *(*pngRead)(skin_t *skin, unsigned char *fname);
 };
 
-extern skin_t *loadskin(char *skindir, int desktopbpp);
+skin_t *loadskin(char *skindir, int desktopbpp);
 
 // --- Widget types ---
 
diff --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index 05d04db32d..245bbc0be2 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -55,7 +55,7 @@ int gui_sub_pos_y = -1;
 
 /* External functions */
 extern char *proc_priority;
-extern int m_config_parse_config_file(m_config_t *config, char *conffile);
+int m_config_parse_config_file(m_config_t *config, char *conffile);
 
 static m_config_t *gui_conf;
 static const m_option_t gui_opts[] =