diff --git a/src/hb-static.cc b/src/hb-static.cc
index 0b92443e7..ea9bd5a71 100644
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
@@ -28,6 +28,7 @@
 
 #include "hb-open-type.hh"
 #include "hb-ot-layout-common.hh"
+#include "hb-aat-layout-common.hh"
 
 #include "hb-face.hh"
 #include "hb-ot-head-table.hh"
@@ -41,10 +42,8 @@ hb_vector_size_impl_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (hb_vector_
 DEFINE_NULL_NAMESPACE_BYTES (OT, Index) =  {0xFF,0xFF};
 DEFINE_NULL_NAMESPACE_BYTES (OT, LangSys) = {0x00,0x00, 0xFF,0xFF, 0x00,0x00};
 DEFINE_NULL_NAMESPACE_BYTES (OT, RangeRecord) = {0x00,0x01, 0x00,0x00, 0x00, 0x00};
-/* Hand-coded because Lookup is a template.
- * Not sure why I need the extern "C" :(.
- * Sad. */
-extern "C" HB_INTERNAL const unsigned char _hb_Null_AAT_Lookup[2] = {0xFF, 0xFF};
+/* Hand-coded because Lookup is a template.  Sad. */
+HB_INTERNAL const unsigned char _hb_Null_AAT_Lookup[2] = {0xFF, 0xFF};
 
 
 void