diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index d2387b051d..84f4fe12bc 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1187,8 +1187,8 @@
  * Caller:  library/havege.c
  *
  * This module is used by the HAVEGE random number generator.
- */
 #define POLARSSL_TIMING_C
+ */
 
 /**
  * \def POLARSSL_VERSION_C
@@ -1332,6 +1332,10 @@
 #error "POLARSSL_GCM_C defined, but not all prerequisites"
 #endif
 
+#if defined(POLARSSL_HAVEGE_C) && !defined(POLARSSL_TIMING_C)
+#error "POLARSSL_HAVEGE_C defined, but not all prerequisites"
+#endif
+
 #if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) && !defined(POLARSSL_DHM_C)
 #error "POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED defined, but not all prerequisites"
 #endif