diff --git a/Makefile b/Makefile
index 42c40750..32d621e3 100644
--- a/Makefile
+++ b/Makefile
@@ -94,9 +94,8 @@ LIBC_BOTTOM_HALF_OMIT_SOURCES := \
 	$(LIBC_BOTTOM_HALF_SOURCES)/accept-wasip2.c
 LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_OMIT_SOURCES),$(LIBC_BOTTOM_HALF_ALL_SOURCES))
 # Omit p2-specific headers from include-all.c test.
-# setjmp.h is excluded because it requires a different compiler option
 # for exception-handling.
-INCLUDE_ALL_CLAUSES := -not -name wasip2.h -not -name descriptor_table.h -not -name setjmp.h
+INCLUDE_ALL_CLAUSES := -not -name wasip2.h -not -name descriptor_table.h
 endif
 
 ifeq ($(WASI_SNAPSHOT), p2)
@@ -823,8 +822,10 @@ check-symbols: startup_files libc
 	#
 	# Generate a test file that includes all public C header files.
 	#
+	# setjmp.h is excluded because it requires a different compiler option
+	#
 	cd "$(SYSROOT_INC)" && \
-	  for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h $(INCLUDE_ALL_CLAUSES) |grep -v /bits/ |grep -v /c++/); do \
+	  for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h -not -name setjmp.h $(INCLUDE_ALL_CLAUSES) |grep -v /bits/ |grep -v /c++/); do \
 	      echo '#include <'$$header'>' | sed 's/\.\///' ; \
 	done |LC_ALL=C sort >$(SYSROOT_SHARE)/include-all.c ; \
 	cd - >/dev/null