diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 844945cb77b3e303d3175c7bdf7ad5f49c26f5ea..95b26a7a3dc6e99184c0e8752cdc0a73cdc541d4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -27,10 +27,6 @@
  */
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "avutil.h"
 #include <sys/types.h> /* size_t */
 
@@ -3152,8 +3148,4 @@ extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 #define AVERROR_NOTSUPP     AVERROR(ENOSYS)  /**< Operation not supported. */
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* AVCODEC_H */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1e8028cdcd8debec8d13f1f30a4b0b013110d711..d63966662e0d3a9feaf59ce6b06bd1b83e858c07 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -21,10 +21,6 @@
 #ifndef AVFORMAT_H
 #define AVFORMAT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)
 #define LIBAVFORMAT_VERSION     51.12.1
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
@@ -889,9 +885,5 @@ int match_ext(const char *filename, const char *extensions);
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* AVFORMAT_H */
 
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 32bc40bfbf7721977101f800d41f0f5348dddd63..e010ed3567cbc70127c5db679365671da357d3f9 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -27,10 +27,6 @@
  */
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
@@ -130,8 +126,4 @@ enum PixelFormat {
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* AVUTIL_H */
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index eed92ba6d5db2bcf961d56aee667bbd8993dc455..a240558f724e59876791a2a6fd1962f141ebd31c 100644
--- a/libpostproc/postprocess.h
+++ b/libpostproc/postprocess.h
@@ -27,10 +27,6 @@
  *     external api for the pp stuff
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
 #define LIBPOSTPROC_VERSION     51.1.0
 #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
@@ -77,8 +73,4 @@ void pp_free_context(pp_context_t *ppContext);
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif