diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6123210925..0e59852eae 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -754,6 +754,10 @@ static const AVOption options[]={
 
 #undef A
 #undef V
+#undef S
+#undef E
+#undef D
+#undef DEFAULT
 
 static AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options };
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6348ac98df..d9b57897dc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -474,6 +474,10 @@ static const AVOption options[]={
 {NULL},
 };
 
+#undef E
+#undef D
+#undef DEFAULT
+
 static const AVClass av_format_context_class = { "AVFormatContext", format_to_name, options };
 
 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0)