diff --git a/configure b/configure
index 92520ff5c9..2bfde4fc4a 100755
--- a/configure
+++ b/configure
@@ -7680,6 +7680,18 @@ cat > config.h << EOF
 /* int_fastXY_t emulation */
 $_def_fast_inttypes
 
+/* libdvdcss */
+#define HAVE_ERRNO_H 1
+#define HAVE_LIMITS_H 1
+
+/* libdvdcss + libfaad2 */
+#define HAVE_UNISTD_H 1
+
+/* libfaad2 */
+#define STDC_HEADERS 1
+#define HAVE_MEMCPY 1
+#define HAVE_STRCHR 1
+
 /* use GNU internationalization */
 $_def_i18n
 
diff --git a/libdvdcss/Makefile b/libdvdcss/Makefile
index 66953f184e..38b3e814cc 100644
--- a/libdvdcss/Makefile
+++ b/libdvdcss/Makefile
@@ -9,7 +9,6 @@ SRCS_COMMON = css.c \
               libdvdcss.c \
               #bsdi_ioctl \
 
-CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" \
-         -DHAVE_LIMITS_H -DHAVE_ERRNO_H -DHAVE_UNISTD_H
+CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
 
 include ../mpcommon.mak
diff --git a/libfaad2/common.h b/libfaad2/common.h
index 44f1ce92a9..e43e11ed13 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -178,15 +178,6 @@ typedef float float32_t;
 
 #else
 
-/* Define if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
 #include <stdio.h>
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index 611baad3d7..084c44bb24 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -76,7 +76,7 @@
  typedef unsigned __int64 uint64_t;
  typedef unsigned __int32 uint32_t;
  typedef unsigned __int16 uint16_t;
-@@ -159,11 +169,24 @@
+@@ -159,5 +169,9 @@
  typedef __int32 int32_t;
  typedef __int16 int16_t;
  typedef __int8  int8_t;
@@ -86,21 +86,6 @@
 +
  typedef float float32_t;
  
- 
- #else
- 
-+/* Define if you have the `memcpy' function. */
-+#define HAVE_MEMCPY 1
-+
-+/* Define if you have the `strchr' function. */
-+#define HAVE_STRCHR 1
-+
-+/* Define if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
- #include <stdio.h>
- #if HAVE_SYS_TYPES_H
- # include <sys/types.h>
 @@ -289,7 +319,7 @@
    }