diff --git a/configure b/configure
index f0c66d9f59..2abf11614a 100755
--- a/configure
+++ b/configure
@@ -8872,6 +8872,28 @@ if enabled checkasm; then
 EOF
 
     print_config HAVE_ "$TMPH" elf_aux_info getauxval ioctl isatty linux_perf pthread_np_h pthread_setaffinity_np sigaction siglongjmp clock_gettime prctl
+
+    if enabled aarch64; then
+        print_config HAVE_ "$TMPH" as_archext_sve_directive sve
+        print_config HAVE_ "$TMPH" as_archext_sme_directive sme
+    elif enabled riscv; then
+        print_config HAVE_ "$TMPH" sys_hwprobe_h asm_hwprobe_h
+    fi
+
+    cat >> $TMPH <<EOF
+#endif /* FFMPEG_CHECKASM_CONFIG_GENERATED_H */
+EOF
+
+    cp_if_changed $TMPH checkasm_config_generated.h
+
+    # Reopen a new TMPH for checkasm_config_generated.h
+    cat > $TMPH <<EOF
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CHECKASM_HEADER_CONFIG_GENERATED_H
+#define FFMPEG_CHECKASM_HEADER_CONFIG_GENERATED_H
+
+EOF
+
     print_config CHECKASM_ARCH_ "$TMPH" $ARCH_LIST
 
     # The callcheck harness requires x86asm/rv support on these platforms, so
@@ -8892,18 +8914,11 @@ EOF
 EOF
     fi
 
-    if enabled aarch64; then
-        print_config HAVE_ "$TMPH" as_archext_sve_directive sve
-        print_config HAVE_ "$TMPH" as_archext_sme_directive sme
-    elif enabled riscv; then
-        print_config HAVE_ "$TMPH" sys_hwprobe_h asm_hwprobe_h
-    fi
-
     cat >> $TMPH <<EOF
-#endif /* FFMPEG_CHECKASM_CONFIG_GENERATED_H */
+#endif /* FFMPEG_CHECKASM_HEADER_CONFIG_GENERATED_H */
 EOF
 
-    cp_if_changed $TMPH checkasm_config_generated.h
+    cp_if_changed $TMPH checkasm_header_config_generated.h
 
     if enabled x86asm; then
         append config_files $TMPASM
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 3b1fc7b2ca..5a268089ee 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -147,11 +147,15 @@ $(CHECKASMOBJS): CFLAGS  := -I$(SRC_PATH)/tests/checkasm/ext/include $(CFLAGS)
 $(CHECKASMOBJS): ASFLAGS := -I$(SRC_PATH)/tests/checkasm/ext/include $(ASFLAGS)
 OUTDIRS += $(CHECKASMDIRS)
 
-# Expose checkasm_config_generated.h/asm to checkasm tests as well, as it
+# Expose checkasm_config_header_generated.h to checkasm tests as well, as it
 # modifies the behavior of include/checkasm/header_config.h
-$(CHECKASMOBJS): CFLAGS      += -DCHECKASM_HAVE_GENERATED_H
-$(CHECKASMOBJS): ASFLAGS     += -DCHECKASM_HAVE_GENERATED_H
-$(CHECKASMOBJS): X86ASMFLAGS += -DCHECKASM_HAVE_GENERATED_H
+$(CHECKASMOBJS): CFLAGS      += -DCHECKASM_HAVE_HEADER_GENERATED_H
+$(CHECKASMOBJS): ASFLAGS     += -DCHECKASM_HAVE_HEADER_GENERATED_H
+
+# Expose checkasm_config_generated.h/asm only to checkasm itself.
+$(EXT_CHECKASMOBJS): CFLAGS      += -DCHECKASM_HAVE_GENERATED_H
+$(EXT_CHECKASMOBJS): ASFLAGS     += -DCHECKASM_HAVE_GENERATED_H
+$(EXT_CHECKASMOBJS): X86ASMFLAGS += -DCHECKASM_HAVE_GENERATED_H
 
 tests/checkasm/checkasm.o: CFLAGS += -Umain