diff --git a/include/Config/windows.h b/include/Config/windows.h
new file mode 100644
index 00000000000..806a90ad240
--- /dev/null
+++ b/include/Config/windows.h
@@ -0,0 +1,23 @@
+/* 
+ *                     The LLVM Compiler Infrastructure
+ *
+ * This file was developed by the LLVM research group and is distributed under
+ * the University of Illinois Open Source License. See LICENSE.TXT for details.
+ * 
+ ******************************************************************************
+ *
+ * Description:
+ *	This header file is the autoconf replacement for windows.h (if it lives
+ *	on the system).
+ */
+
+#ifndef _CONFIG_DLFCN_H
+#define _CONFIG_DLFCN_H
+
+#include "Config/config.h"
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#endif
diff --git a/include/llvm/Config/windows.h b/include/llvm/Config/windows.h
new file mode 100644
index 00000000000..806a90ad240
--- /dev/null
+++ b/include/llvm/Config/windows.h
@@ -0,0 +1,23 @@
+/* 
+ *                     The LLVM Compiler Infrastructure
+ *
+ * This file was developed by the LLVM research group and is distributed under
+ * the University of Illinois Open Source License. See LICENSE.TXT for details.
+ * 
+ ******************************************************************************
+ *
+ * Description:
+ *	This header file is the autoconf replacement for windows.h (if it lives
+ *	on the system).
+ */
+
+#ifndef _CONFIG_DLFCN_H
+#define _CONFIG_DLFCN_H
+
+#include "Config/config.h"
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#endif