diff --git a/ffmpeg.c b/ffmpeg.c
index 70372af455..7eed04f3b3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -21,6 +21,7 @@
 #include "avformat.h"
 #include "framehook.h"
 #include "dsputil.h"
+#include "opt.h"
 
 #ifndef CONFIG_WIN32
 #include <unistd.h>
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 826329f8ac..82a198453e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -12,7 +12,6 @@ extern "C" {
 #endif
 
 #include "avutil.h"
-#include "opt.h"
 #include <sys/types.h> /* size_t */
 
 //FIXME the following 2 really dont belong in here
@@ -682,7 +681,7 @@ struct AVCLASS {
 					or AVFormatContext, which begin with an AVClass.
 					Needed because av_log is in libavcodec and has no visibility
 					of AVIn/OutputFormat */
-    AVOption *option;
+    struct AVOption *option;
 };
 
 /**
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 80770549b9..8934c23d4e 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -25,6 +25,7 @@
  */
  
 #include "avcodec.h"
+#include "opt.h"
  
 static double av_parse_num(const char *name, char **tail){
     double d;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3eb1e60014..8fc275bc6b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -28,6 +28,7 @@
 #include "dsputil.h"
 #include "mpegvideo.h"
 #include "integer.h"
+#include "opt.h"
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>