diff --git a/src/check-c-linkage-decls.py b/src/check-c-linkage-decls.py
index fe18eda89..27f5639e7 100755
--- a/src/check-c-linkage-decls.py
+++ b/src/check-c-linkage-decls.py
@@ -14,6 +14,7 @@ def removeprefix(s):
 
 HBHEADERS = [os.path.basename (x) for x in os.getenv ('HBHEADERS', '').split ()] or \
 	[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
+HBHEADERS = [x for x in HBHEADERS if x.endswith ('.h')]
 HBSOURCES = [
     removeprefix(x) for x in os.getenv ('HBSOURCES', '').split ()
 ] or [
diff --git a/src/hb-cplusplus.hh b/src/hb-cplusplus.hh
index a640e192d..b6b5c8f78 100644
--- a/src/hb-cplusplus.hh
+++ b/src/hb-cplusplus.hh
@@ -27,9 +27,6 @@
 
 #include "hb.h"
 
-HB_BEGIN_DECLS
-HB_END_DECLS
-
 #ifdef __cplusplus
 
 #include <functional>
diff --git a/src/hb-wasm-api.h b/src/hb-wasm-api.h
index f9bd98e5e..bb977eeb1 100644
--- a/src/hb-wasm-api.h
+++ b/src/hb-wasm-api.h
@@ -27,6 +27,9 @@
 
 /*
 #include "hb.h"
+
+HB_BEGIN_DECLS
+HB_END_DECLS
 */
 
 #include <stdint.h>