diff --git a/Doxyfile b/Doxyfile
index 73b4e992fd40a6ac135f9d679f5d3da1e402fd7a..9e4fdcdd0f5b420ca77d928fe38eda8933402db5 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -836,7 +836,7 @@ INCLUDE_FILE_PATTERNS  =
 # omitted =1 is assumed.
 
 PREDEFINED             = __attribute__(x)="" "RENAME(x)=x ## _TMPL" "DEF(x)=x ## _TMPL" \
-                         HAVE_BUILTIN_VECTOR HAVE_AV_CONFIG_H HAVE_MMX HAVE_MMX2 HAVE_3DNOW \
+                         HAVE_AV_CONFIG_H HAVE_MMX HAVE_MMX2 HAVE_3DNOW \
                          ATTR_ALIGN(x)=""
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
diff --git a/configure b/configure
index 88b24ee45ac8fb14a8004bc32ee3b45fb15457cb..dec9ad3bb6e2d1998a9f0d0c78de684096e92dcb 100755
--- a/configure
+++ b/configure
@@ -1223,31 +1223,6 @@ int main(void) {
 }
 EOF
 
-# test gcc version to see if vector builtins can be used
-# currently only used on i386 for MMX builtins
-check_cc -msse <<EOF && builtin_vector=yes || builtin_vector=no
-#include <xmmintrin.h>
-int main(void) {
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-return 0;
-#else
-#error no vector builtins
-#endif
-}
-EOF
-
-# test for mm3dnow.h
-test "$cpu" = "x86_64" && march=k8 || march=athlon
-check_cc -march=$march <<EOF && mm3dnow=yes || mm3dnow=no
-#include <mm3dnow.h>
-int main(void) {
-__m64 b1;
-b1 = _m_pswapd(b1);
-_m_femms();
-return 0;
-}
-EOF
-
 # ---
 # big/little-endian test
 if test "$cross_compile" = "no"; then
@@ -1575,8 +1550,6 @@ echo "inttypes.h       $inttypes"
 echo "broken inttypes.h $emu_fast_int"
 if test $cpu = "x86" -o $cpu = "x86_64"; then
     echo "MMX enabled      $mmx"
-    echo "Vector Builtins  $builtin_vector"
-    echo "3DNow! Builtins  $mm3dnow"
 fi
 if test $cpu = "armv4l"; then
     echo "ARMv5TE enabled  $armv5te"
@@ -1759,14 +1732,6 @@ if test "$mmx" = "yes" ; then
   echo "#define HAVE_MMX 1" >> $TMPH
   echo "#define __CPU__ 586" >> $TMPH
 fi
-if test "$builtin_vector" = "yes" ; then
-  echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak
-  echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH
-fi
-if test "$mm3dnow" = "yes" ; then
-  echo "TARGET_BUILTIN_3DNOW=yes" >> config.mak
-  echo "#define HAVE_MM3DNOW 1" >> $TMPH
-fi
 if test "$armv5te" = "yes" ; then
   echo "TARGET_ARMV5TE=yes" >> config.mak
   echo "#define HAVE_ARMV5TE 1" >> $TMPH
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 94aa96ad27851e527b19bd7a4bc8f9701c65acc8..3d961b8fa1ee872df033465c299b7fc87e812ed0 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -339,19 +339,6 @@ endif
 ifeq ($(CONFIG_CAVS_DECODER),yes)
 OBJS += i386/cavsdsp_mmx.o
 endif
-ifeq ($(TARGET_BUILTIN_VECTOR),yes)
-i386/fft_sse.o: CFLAGS+= -msse
-depend: CFLAGS+= -msse
-endif
-ifeq ($(TARGET_BUILTIN_3DNOW),yes)
-i386/fft_3dn.o: CFLAGS+= -m3dnow
-ifeq ($(TARGET_ARCH_X86),yes)
-i386/fft_3dn2.o: CFLAGS+= -march=athlon
-endif
-ifeq ($(TARGET_ARCH_X86_64),yes)
-i386/fft_3dn2.o: CFLAGS+= -march=k8
-endif
-endif
 endif
 
 # armv4l specific stuff