Remove redundant extern declarations, #include the right headers instead.

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

3 files changed, 4 insertions, 4 deletions

diff --git a/gui/cfg.c b/gui/cfg.c
index 706a41ae87..2f96491675 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -14,6 +14,8 @@
 #include "libvo/video_out.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
+#include "libass/ass.h"
+#include "libass/ass_mp.h"
 
 #include "cfg.h"
 #include "app.h"
diff --git a/gui/cfg.h b/gui/cfg.h
index c2e84efb6d..f6c9944127 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -64,10 +64,6 @@ typedef struct {
     int bottom_margin;
 } gtkASS_t;
 extern gtkASS_t gtkASS;
-extern int ass_enabled;
-extern int ass_use_margins;
-extern int ass_top_margin;
-extern int ass_bottom_margin;
 #endif
 
 extern int cfg_read( void );
diff --git a/gui/interface.c b/gui/interface.c
index c77ee2c0b3..aa257e777a 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -28,6 +28,8 @@
 #include "mixer.h"
 #include "libaf/af.h"
 #include "libaf/equalizer.h"
+#include "libass/ass.h"
+#include "libass/ass_mp.h"
 
 extern af_cfg_t af_cfg;