diff --git a/src/harfbuzz-world.cc b/src/harfbuzz-world.cc
index 138a572..82d85d5 100644
--- a/src/harfbuzz-world.cc
+++ b/src/harfbuzz-world.cc
@@ -2,6 +2,33 @@
 #include HB_FEATURES_H
 #endif
 
+#ifdef HB_HAS_CORETEXT
+#define HAVE_CORETEXT 1
+#endif
+#ifdef HB_HAS_DIRECTWRITE
+#define HAVE_DIRECTWRITE 1
+#endif
+#ifdef HB_HAS_FREETYPE
+#define HAVE_FREETYPE 1
+#endif
+#ifdef HB_HAS_GDI
+#define HAVE_GDI 1
+#endif
+#ifdef HB_HAS_GLIB
+#define HAVE_GLIB 1
+#endif
+#ifdef HB_HAS_GRAPHITE
+#define HAVE_GRAPHITE 1
+#endif
+#ifdef HB_HAS_UNISCRIBE
+#define HAVE_UNISCRIBE 1
+#define HAVE_GDI 1
+#endif
+#ifdef HB_HAS_WASM
+#define HAVE_WASM 1
+#endif
+
+
 /* Core library. */
 #include "OT/Var/VARC/VARC.cc"
 #include "hb-aat-layout.cc"
@@ -66,38 +93,32 @@
 #endif
 
 #ifdef HB_HAS_CORETEXT
-#define HAVE_CORETEXT 1
 #include "hb-coretext-font.cc"
 #include "hb-coretext-shape.cc"
 #include "hb-coretext.cc"
 #endif
 
 #ifdef HB_HAS_DIRECTWRITE
-#define HAVE_DIRECTWRITE 1
 #include "hb-directwrite-font.cc"
 #include "hb-directwrite-shape.cc"
 #include "hb-directwrite.cc"
 #endif
 
 #ifdef HB_HAS_FREETYPE
-#define HAVE_FREETYPE 1
 #include "hb-ft.cc"
 #endif
 
 #ifdef HB_HAS_GDI
 #ifndef HAVE_GDI
-#define HAVE_GDI 1
 #include "hb-gdi.cc"
 #endif
 #endif
 
 #ifdef HB_HAS_GLIB
-#define HAVE_GLIB 1
 #include "hb-glib.cc"
 #endif
 
 #ifdef HB_HAS_GRAPHITE
-#define HAVE_GRAPHITE 1
 #include "hb-graphite2.cc"
 #endif
 
@@ -146,8 +167,6 @@
 #endif
 
 #ifdef HB_HAS_UNISCRIBE
-#define HAVE_UNISCRIBE 1
-#define HAVE_GDI 1
 #include "hb-uniscribe.cc"
 #endif
 
@@ -163,7 +182,6 @@
 #endif
 
 #ifdef HB_HAS_WASM
-#define HAVE_WASM 1
 #include "hb-wasm-api.cc"
 #include "hb-wasm-shape.cc"
 #endif
diff --git a/src/harfbuzz-world.cc.in b/src/harfbuzz-world.cc.in
index ab72189..7d07ecd 100644
--- a/src/harfbuzz-world.cc.in
+++ b/src/harfbuzz-world.cc.in
@@ -2,6 +2,33 @@
 #include HB_FEATURES_H
 #endif
 
+#ifdef HB_HAS_CORETEXT
+#define HAVE_CORETEXT 1
+#endif
+#ifdef HB_HAS_DIRECTWRITE
+#define HAVE_DIRECTWRITE 1
+#endif
+#ifdef HB_HAS_FREETYPE
+#define HAVE_FREETYPE 1
+#endif
+#ifdef HB_HAS_GDI
+#define HAVE_GDI 1
+#endif
+#ifdef HB_HAS_GLIB
+#define HAVE_GLIB 1
+#endif
+#ifdef HB_HAS_GRAPHITE
+#define HAVE_GRAPHITE 1
+#endif
+#ifdef HB_HAS_UNISCRIBE
+#define HAVE_UNISCRIBE 1
+#define HAVE_GDI 1
+#endif
+#ifdef HB_HAS_WASM
+#define HAVE_WASM 1
+#endif
+
+
 /* Core library. */
 %%BASE_SOURCES%%
 
@@ -10,34 +37,28 @@
 #endif
 
 #ifdef HB_HAS_CORETEXT
-#define HAVE_CORETEXT 1
 %%CORETEXT_SOURCES%%
 #endif
 
 #ifdef HB_HAS_DIRECTWRITE
-#define HAVE_DIRECTWRITE 1
 %%DIRECTWRITE_SOURCES%%
 #endif
 
 #ifdef HB_HAS_FREETYPE
-#define HAVE_FREETYPE 1
 %%FREETYPE_SOURCES%%
 #endif
 
 #ifdef HB_HAS_GDI
 #ifndef HAVE_GDI
-#define HAVE_GDI 1
 %%GDI_SOURCES%%
 #endif
 #endif
 
 #ifdef HB_HAS_GLIB
-#define HAVE_GLIB 1
 %%GLIB_SOURCES%%
 #endif
 
 #ifdef HB_HAS_GRAPHITE
-#define HAVE_GRAPHITE 1
 %%GRAPHITE_SOURCES%%
 #endif
 
@@ -58,8 +79,6 @@
 #endif
 
 #ifdef HB_HAS_UNISCRIBE
-#define HAVE_UNISCRIBE 1
-#define HAVE_GDI 1
 %%UNISCRIBE_SOURCES%%
 #endif
 
@@ -68,6 +87,5 @@
 #endif
 
 #ifdef HB_HAS_WASM
-#define HAVE_WASM 1
 %%WASM_SOURCES%%
 #endif