README.ALT-AMR            |    9 ---------
 cmdutils.c                |    3 +--
 configure                 |   38 ++++++++++++++++----------------------
 libavcodec/Makefile       |    2 +-
 libavcodec/avcodec.h      |    8 --------
 libavformat/Makefile      |    2 +-
 libavformat/avformat.h    |    8 --------
 libavutil/Makefile        |    2 --
 libavutil/avutil.h        |    8 --------
 libpostproc/postprocess.h |    8 --------
 10 files changed, 19 insertions(+), 69 deletions(-)

diff --git a/README.ALT-AMR b/README.ALT-AMR
deleted file mode 100644
index 136ca20..0000000
--- a/README.ALT-AMR
+++ /dev/null
@@ -1,9 +0,0 @@
-In order to be able to play AMR audio file formats, you'll need to do this:
-
-1) add the line to your sources.list:
-
-  rpm ftp://ftp.altlinux.ru/pub/people/thresh/amr i586 hasher
-
-2) # apt-get update && apt-get install libamrwb libamrnb
-
-3) enjoy your amr files :)
diff --git a/cmdutils.c b/cmdutils.c
index 6003fc1..abd10c5 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -159,8 +159,7 @@ void show_banner(const char *program_name, int program_birth_year)
 {
     fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-2008 Fabrice Bellard, et al.\n",
             program_name, program_birth_year);
-    fprintf(stderr, "All the errors with this package you should report \n");
-    fprintf(stderr, "to ALT Linux bugzilla (https://bugzilla.altlinux.org)!\n");
+    fprintf(stderr, "  configuration: " FFMPEG_CONFIGURATION "\n");
     fprintf(stderr, "  libavutil version: " AV_STRINGIFY(LIBAVUTIL_VERSION) "\n");
     fprintf(stderr, "  libavcodec version: " AV_STRINGIFY(LIBAVCODEC_VERSION) "\n");
     fprintf(stderr, "  libavformat version: " AV_STRINGIFY(LIBAVFORMAT_VERSION) "\n");
diff --git a/configure b/configure
index dc3f160..f719979 100755
--- a/configure
+++ b/configure
@@ -1852,9 +1852,9 @@ check_deps $CONFIG_LIST       \
            $OUTDEV_LIST       \
            $PROTOCOL_LIST     \
 
-enabled libdc1394 && append pkg_requires_private "libraw1394"
-enabled libtheora && append pkg_requires_private "theora"
-enabled libvorbis && append pkg_requires_private "vorbisenc"
+enabled libdc1394 && append pkg_requires "libraw1394"
+enabled libtheora && append pkg_requires "theora"
+enabled libvorbis && append pkg_requires "vorbisenc"
 
 echo "install prefix            $PREFIX"
 echo "source path               $source_path"
@@ -2126,10 +2126,8 @@ name=$1
 comment=$2
 version=$3
 libs=$4
-libs_private=$5
-requires=$6
-requires_private=$7
-include=$8
+requires=$5
+include=$6
 cat <<EOF >$name.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
@@ -2140,10 +2138,8 @@ Name: $name
 Description: $comment
 Version: $version
 Requires: $requires
-Requires.private: $requires_private
 Conflicts:
 Libs: -L\${libdir} $libs
-Libs.private: $libs_private
 Cflags: -I\${includedir}/$include
 EOF
 }
@@ -2155,7 +2151,6 @@ comment=$2
 version=$3
 libs=$4
 requires=$5
-requires_private=$6
 cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
@@ -2166,35 +2161,34 @@ Name: $name
 Description: $comment
 Version: $version
 Requires: $requires
-Requires.private: $requires_private
 Conflicts:
 Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
 Cflags: -I\${includedir}
 EOF
 }
 
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" "" "" ffmpeg
+pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
 pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
 
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" -lavcodec "$extralibs" "libavutil = $lavu_version" "$pkg_requires_private" ffmpeg
-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "libavutil = $lavu_version" "$pkg_requires_private"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
 
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" -lavformat "$extralibs" "libavcodec = $lavc_version" "$pkg_requires_private" ffmpeg
-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "libavcodec = $lavc_version" "$pkg_requires_private"
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
 
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice" "$extralibs" "libavformat = $lavf_version" "$pkg_requires_private" ffmpeg
-pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "libavformat = $lavf_version" "$pkg_requires_private"
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
 if enabled pp; then
-    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" "" "" postproc
+    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
     pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
 fi
 
 if enabled swscaler; then
-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "" "libavutil = $lavu_version" "" ffmpeg
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
     pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
 else
-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "" "libavcodec = $lavc_version" "$pkg_requires_private" ffmpeg
-    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" "$pkg_requires_private"
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
     apply libswscale.pc sed s/^Libs:.*$/Libs:/
     apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
 fi
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e9452fd..e7d7e23 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -30,7 +30,7 @@ OBJS = allcodecs.o \
        utils.o \
 
 
-HEADERS = avcodec.h opt.h dsputil.h
+HEADERS = avcodec.h opt.h
 
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
 OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3.o mdct.o fft.o
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b3325d2..146c72a 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 */
 
@@ -2991,8 +2987,4 @@ int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 #define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* FFMPEG_AVCODEC_H */
diff --git a/libavformat/Makefile b/libavformat/Makefile
index fad6211..041f224 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -8,7 +8,7 @@ CFLAGS += -I$(SRC_PATH)/libavcodec
 
 OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
 
-HEADERS = avformat.h avio.h riff.h rtsp.h rtspcodes.h
+HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
 
 # muxers/demuxers
 OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index c69b98a..b280148 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -21,10 +21,6 @@
 #ifndef FFMPEG_AVFORMAT_H
 #define FFMPEG_AVFORMAT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LIBAVFORMAT_VERSION_INT ((52<<16)+(7<<8)+0)
 #define LIBAVFORMAT_VERSION     52.7.0
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
@@ -1000,8 +996,4 @@ int match_ext(const char *filename, const char *extensions);
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* FFMPEG_AVFORMAT_H */
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 62fb11e..04fd16f 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -35,8 +35,6 @@ HEADERS = adler32.h \
           mem.h \
           random.h \
           rational.h \
-		  bswap.h \
-		  intreadwrite.h \
           sha1.h
 
 NAME=avutil
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 8b424f5..7e37026 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
 
@@ -132,8 +128,4 @@ enum PixelFormat {
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* FFMPEG_AVUTIL_H */
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index 2de22fe..4782bac 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
@@ -83,8 +79,4 @@ void pp_free_context(pp_context_t *ppContext);
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* FFMPEG_POSTPROCESS_H */