diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1e2560c941a2ec069505d76b532ce7fbc85894a5..eed3bdb48314e92424d5a0124a53b524c3fe06b2 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -20,6 +20,12 @@
 #ifndef AVCODEC_OPTIONS_TABLE
 #define AVCODEC_OPTIONS_TABLE
 
+#include <float.h>
+#include <limits.h>
+
+#include "libavutil/opt.h"
+#include "avcodec.h"
+
 #define OFFSET(x) offsetof(AVCodecContext,x)
 #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C
 //these names are too long to be readable
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 683596c2061430de6dc5dbf2a96441c9a3f59395..58f3dcff68749d7367c4f0ddfb6eb9c2d6e47d96 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -19,6 +19,11 @@
 #ifndef AVFORMAT_OPTIONS_TABLE
 #define AVFORMAT_OPTIONS_TABLE
 
+#include <limits.h>
+
+#include "libavutil/opt.h"
+#include "avformat.h"
+
 #define OFFSET(x) offsetof(AVFormatContext,x)
 #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C
 //these names are too long to be readable