diff --git a/include/Support/ThreadSupport.h b/include/Support/ThreadSupport.h.in
similarity index 90%
rename from include/Support/ThreadSupport.h
rename to include/Support/ThreadSupport.h.in
index 9689307f87a..470010219fc 100644
--- a/include/Support/ThreadSupport.h
+++ b/include/Support/ThreadSupport.h.in
@@ -17,9 +17,7 @@
 #ifndef SUPPORT_THREADSUPPORT_H
 #define SUPPORT_THREADSUPPORT_H
 
-// FIXME: Eventually don't #include config.h here
-#include "Config/config.h"
-#if defined(HAVE_PTHREAD_MUTEX_LOCK) && HAVE_PTHREAD_MUTEX_LOCK
+#if @HAVE_PTHREAD_MUTEX_LOCK@
 #include "Support/ThreadSupport-PThreads.h"
 #else
 #include "Support/ThreadSupport-NoSupport.h"