diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 22d7251..2194d47 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -157,10 +157,6 @@
 #error "POLARSSL_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites"
 #endif
 
-#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_C)
-#error "POLARSSL_MEMORY_C defined, but not all prerequisites"
-#endif
-
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) &&                          \
     ( !defined(POLARSSL_PLATFORM_C) || !defined(POLARSSL_PLATFORM_MEMORY) )
 #error "POLARSSL_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"
@@ -170,10 +166,6 @@
 #error "POLARSSL_PADLOCK_C defined, but not all prerequisites"
 #endif
 
-#if defined(POLARSSL_PBKDF2_C) && !defined(POLARSSL_MD_C)
-#error "POLARSSL_PBKDF2_C defined, but not all prerequisites"
-#endif
-
 #if defined(POLARSSL_PEM_PARSE_C) && !defined(POLARSSL_BASE64_C)
 #error "POLARSSL_PEM_PARSE_C defined, but not all prerequisites"
 #endif
diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
index 32d1c9f..34af46e 100644
--- a/include/mbedtls/platform.h
+++ b/include/mbedtls/platform.h
@@ -30,11 +30,6 @@
 #include POLARSSL_CONFIG_FILE
 #endif
 
-/* Temporary compability hack for to keep MEMORY_C working */
-#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY)
-#define POLARSSL_PLATFORM_MEMORY
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/scripts/config.pl b/scripts/config.pl
index 9cc5034..b21aa0c 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -30,7 +30,6 @@
 POLARSSL_NO_PLATFORM_ENTROPY
 POLARSSL_REMOVE_ARC4_CIPHERSUITES
 POLARSSL_SSL_HW_RECORD_ACCEL
-POLARSSL_SSL_DISABLE_RENEGOTIATION
 POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
 POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
 POLARSSL_ZLIB_SUPPORT
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 82ed4bc..df5e86c 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -141,7 +141,6 @@
 scripts/config.pl full
 scripts/config.pl unset POLARSSL_PLATFORM_C
 scripts/config.pl unset POLARSSL_PLATFORM_MEMORY
-scripts/config.pl unset POLARSSL_MEMORY_C
 scripts/config.pl unset POLARSSL_MEMORY_BUFFER_ALLOC_C
 scripts/config.pl unset POLARSSL_FS_IO
 CC=gcc CFLAGS='-Werror -O0' make