diff --git a/src/Makefile.sources b/src/Makefile.sources
index e61315be62c76871d0d820f285646144fbb077cb..0615a8bfcd4db9e1419a376942990fdd7e5bc6b1 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -31,6 +31,7 @@ HB_BASE_sources = \
 	hb-cff1-interp-cs.hh \
 	hb-cff2-interp-cs.hh \
 	hb-common.cc \
+	hb-config.hh \
 	hb-debug.hh \
 	hb-dispatch.hh \
 	hb-face.cc \
diff --git a/src/hb-config.hh b/src/hb-config.hh
new file mode 100644
index 0000000000000000000000000000000000000000..385ea4828e8363fab713e8fa5ad8ba888c0bf0a9
--- /dev/null
+++ b/src/hb-config.hh
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2019  Facebook, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Facebook Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_CONFIG_HH
+#define HB_CONFIG_HH
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+
+#endif /* HB_CONFIG_HH */
diff --git a/src/hb.hh b/src/hb.hh
index 0aa55af169bbcfb03b9ff169f9dcd46c9cf7570c..e4c7271bdb75011aa85ab09a362b1cd1374f13f8 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -29,6 +29,7 @@
 #ifndef HB_HH
 #define HB_HH
 
+
 #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC
 #ifdef _MSC_VER
 #pragma warning( disable: 4068 ) /* Unknown pragma */
@@ -129,9 +130,9 @@
 #endif
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+
+#include "hb-config.hh"
+
 
 /*
  * Following added based on what AC_USE_SYSTEM_EXTENSIONS adds to