diff --git a/3B2/rom_rev2_bin.h b/3B2/rom_rev2_bin.h
index 89933267..cb87901e 100644
--- a/3B2/rom_rev2_bin.h
+++ b/3B2/rom_rev2_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_rom_rev2_bin_H
 #define ROM_rom_rev2_bin_H 0
 /*
-   3B2/rom_rev2_bin.h         produced at Mon Aug 23 12:14:08 2021
+   3B2/rom_rev2_bin.h         produced at Mon Aug 23 13:30:22 2021
    from 3B2/rom_rev2.bin which was last modified at Mon Jul 26 08:03:30 2021
    file size: 32768 (0x8000) - checksum: 0xFFD55762
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x8000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "rom_rev2.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY rom_rev2_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x8000
 #define BOOT_CODE_FILENAME_1 "rom_rev2.bin"
 #define BOOT_CODE_ARRAY_1 rom_rev2_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x8000
 #define BOOT_CODE_FILENAME_2 "rom_rev2.bin"
 #define BOOT_CODE_ARRAY_2 rom_rev2_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x8000
 #define BOOT_CODE_FILENAME_3 "rom_rev2.bin"
 #define BOOT_CODE_ARRAY_3 rom_rev2_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x8000
 #define BOOT_CODE_FILENAME_4 "rom_rev2.bin"
 #define BOOT_CODE_ARRAY_4 rom_rev2_bin
diff --git a/3B2/rom_rev2_demon_bin.h b/3B2/rom_rev2_demon_bin.h
index 75c8461b..0184366a 100644
--- a/3B2/rom_rev2_demon_bin.h
+++ b/3B2/rom_rev2_demon_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_rom_rev2_demon_bin_H
 #define ROM_rom_rev2_demon_bin_H 0
 /*
-   3B2/rom_rev2_demon_bin.h         produced at Mon Aug 23 12:14:08 2021
+   3B2/rom_rev2_demon_bin.h         produced at Mon Aug 23 13:30:22 2021
    from 3B2/rom_rev2_demon.bin which was last modified at Mon Jul 26 08:03:30 2021
    file size: 65536 (0x10000) - checksum: 0xFFB345BB
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x10000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "rom_rev2_demon.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY rom_rev2_demon_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x10000
 #define BOOT_CODE_FILENAME_1 "rom_rev2_demon.bin"
 #define BOOT_CODE_ARRAY_1 rom_rev2_demon_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x10000
 #define BOOT_CODE_FILENAME_2 "rom_rev2_demon.bin"
 #define BOOT_CODE_ARRAY_2 rom_rev2_demon_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x10000
 #define BOOT_CODE_FILENAME_3 "rom_rev2_demon.bin"
 #define BOOT_CODE_ARRAY_3 rom_rev2_demon_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x10000
 #define BOOT_CODE_FILENAME_4 "rom_rev2_demon.bin"
 #define BOOT_CODE_ARRAY_4 rom_rev2_demon_bin
diff --git a/3B2/rom_rev3_bin.h b/3B2/rom_rev3_bin.h
index 391bc90b..e63d4881 100644
--- a/3B2/rom_rev3_bin.h
+++ b/3B2/rom_rev3_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_rom_rev3_bin_H
 #define ROM_rom_rev3_bin_H 0
 /*
-   3B2/rom_rev3_bin.h         produced at Mon Aug 23 12:14:08 2021
+   3B2/rom_rev3_bin.h         produced at Mon Aug 23 13:30:22 2021
    from 3B2/rom_rev3.bin which was last modified at Mon Jul 26 08:03:30 2021
    file size: 131072 (0x20000) - checksum: 0xFFDC0EB8
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x20000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "rom_rev3.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY rom_rev3_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x20000
 #define BOOT_CODE_FILENAME_1 "rom_rev3.bin"
 #define BOOT_CODE_ARRAY_1 rom_rev3_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x20000
 #define BOOT_CODE_FILENAME_2 "rom_rev3.bin"
 #define BOOT_CODE_ARRAY_2 rom_rev3_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x20000
 #define BOOT_CODE_FILENAME_3 "rom_rev3.bin"
 #define BOOT_CODE_ARRAY_3 rom_rev3_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x20000
 #define BOOT_CODE_FILENAME_4 "rom_rev3.bin"
 #define BOOT_CODE_ARRAY_4 rom_rev3_bin
diff --git a/PDP11/pdp11_11logo_rom.h b/PDP11/pdp11_11logo_rom.h
index 5eadbd2d..ab5cdda3 100644
--- a/PDP11/pdp11_11logo_rom.h
+++ b/PDP11/pdp11_11logo_rom.h
@@ -1,29 +1,30 @@
 #ifndef ROM_logo_lda_H
 #define ROM_logo_lda_H 0
 /*
-   PDP11/pdp11_11logo_rom.h         produced at Mon Aug 23 12:14:08 2021
+   PDP11/pdp11_11logo_rom.h         produced at Mon Aug 23 13:30:21 2021
    from PDP11/11logo/11logo.lda which was last modified at Mon Jul 26 08:03:31 2021
    file size: 26009 (0x6599) - checksum: 0xFFDD77F7
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x6599
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "11logo.lda"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY logo_lda
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x6599
 #define BOOT_CODE_FILENAME_1 "11logo.lda"
 #define BOOT_CODE_ARRAY_1 logo_lda
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x6599
 #define BOOT_CODE_FILENAME_2 "11logo.lda"
 #define BOOT_CODE_ARRAY_2 logo_lda
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x6599
 #define BOOT_CODE_FILENAME_3 "11logo.lda"
 #define BOOT_CODE_ARRAY_3 logo_lda
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x6599
 #define BOOT_CODE_FILENAME_4 "11logo.lda"
 #define BOOT_CODE_ARRAY_4 logo_lda
diff --git a/PDP11/pdp11_dazzle_dart_rom.h b/PDP11/pdp11_dazzle_dart_rom.h
index 7d4a072c..3c043c3c 100644
--- a/PDP11/pdp11_dazzle_dart_rom.h
+++ b/PDP11/pdp11_dazzle_dart_rom.h
@@ -1,29 +1,30 @@
 #ifndef ROM_dazzle_lda_H
 #define ROM_dazzle_lda_H 0
 /*
-   PDP11/pdp11_dazzle_dart_rom.h         produced at Mon Aug 23 12:14:08 2021
+   PDP11/pdp11_dazzle_dart_rom.h         produced at Mon Aug 23 13:30:21 2021
    from PDP11/dazzledart/dazzle.lda which was last modified at Mon Jul 26 08:03:31 2021
    file size: 6096 (0x17D0) - checksum: 0xFFF83848
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x17D0
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "dazzle.lda"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY dazzle_lda
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x17D0
 #define BOOT_CODE_FILENAME_1 "dazzle.lda"
 #define BOOT_CODE_ARRAY_1 dazzle_lda
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x17D0
 #define BOOT_CODE_FILENAME_2 "dazzle.lda"
 #define BOOT_CODE_ARRAY_2 dazzle_lda
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x17D0
 #define BOOT_CODE_FILENAME_3 "dazzle.lda"
 #define BOOT_CODE_ARRAY_3 dazzle_lda
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x17D0
 #define BOOT_CODE_FILENAME_4 "dazzle.lda"
 #define BOOT_CODE_ARRAY_4 dazzle_lda
diff --git a/PDP11/pdp11_vt_lunar_rom.h b/PDP11/pdp11_vt_lunar_rom.h
index 720ba9a8..5ecaed6f 100644
--- a/PDP11/pdp11_vt_lunar_rom.h
+++ b/PDP11/pdp11_vt_lunar_rom.h
@@ -1,29 +1,30 @@
 #ifndef ROM_lunar_lda_H
 #define ROM_lunar_lda_H 0
 /*
-   PDP11/pdp11_vt_lunar_rom.h         produced at Mon Aug 23 12:14:08 2021
+   PDP11/pdp11_vt_lunar_rom.h         produced at Mon Aug 23 13:30:21 2021
    from PDP11/lunar11/lunar.lda which was last modified at Mon Jul 26 08:03:31 2021
    file size: 13824 (0x3600) - checksum: 0xFFF15D00
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x3600
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "lunar.lda"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY lunar_lda
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x3600
 #define BOOT_CODE_FILENAME_1 "lunar.lda"
 #define BOOT_CODE_ARRAY_1 lunar_lda
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x3600
 #define BOOT_CODE_FILENAME_2 "lunar.lda"
 #define BOOT_CODE_ARRAY_2 lunar_lda
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x3600
 #define BOOT_CODE_FILENAME_3 "lunar.lda"
 #define BOOT_CODE_ARRAY_3 lunar_lda
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x3600
 #define BOOT_CODE_FILENAME_4 "lunar.lda"
 #define BOOT_CODE_ARRAY_4 lunar_lda
diff --git a/VAX/vax_is1000_bin.h b/VAX/vax_is1000_bin.h
index 6b49ce2a..b2dc6ff7 100644
--- a/VAX/vax_is1000_bin.h
+++ b/VAX/vax_is1000_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_is1000_bin_H
 #define ROM_vax_is1000_bin_H 0
 /*
-   VAX/vax_is1000_bin.h         produced at Mon Aug 23 12:14:07 2021
+   VAX/vax_is1000_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/is1000.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 524288 (0x80000) - checksum: 0xFCBCD74A
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x80000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "is1000.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_is1000_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x80000
 #define BOOT_CODE_FILENAME_1 "is1000.bin"
 #define BOOT_CODE_ARRAY_1 vax_is1000_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x80000
 #define BOOT_CODE_FILENAME_2 "is1000.bin"
 #define BOOT_CODE_ARRAY_2 vax_is1000_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x80000
 #define BOOT_CODE_FILENAME_3 "is1000.bin"
 #define BOOT_CODE_ARRAY_3 vax_is1000_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x80000
 #define BOOT_CODE_FILENAME_4 "is1000.bin"
 #define BOOT_CODE_ARRAY_4 vax_is1000_bin
diff --git a/VAX/vax_ka410_bin.h b/VAX/vax_ka410_bin.h
index 18215379..3a238240 100644
--- a/VAX/vax_ka410_bin.h
+++ b/VAX/vax_ka410_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka410_bin_H
 #define ROM_vax_ka410_bin_H 0
 /*
-   VAX/vax_ka410_bin.h         produced at Mon Aug 23 12:14:02 2021
+   VAX/vax_ka410_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka410.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFEDA0B61
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka410.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka410_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka410.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka410_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka410.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka410_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka410.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka410_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka410.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka410_bin
diff --git a/VAX/vax_ka410_xs_bin.h b/VAX/vax_ka410_xs_bin.h
index 99b913a7..264fd7e4 100644
--- a/VAX/vax_ka410_xs_bin.h
+++ b/VAX/vax_ka410_xs_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka410_xs_bin_H
 #define ROM_vax_ka410_xs_bin_H 0
 /*
-   VAX/vax_ka410_xs_bin.h         produced at Mon Aug 23 12:14:07 2021
+   VAX/vax_ka410_xs_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka410_xs.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 32768 (0x8000) - checksum: 0xFFD8BD83
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x8000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka410_xs.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka410_xs_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x8000
 #define BOOT_CODE_FILENAME_1 "ka410_xs.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka410_xs_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x8000
 #define BOOT_CODE_FILENAME_2 "ka410_xs.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka410_xs_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x8000
 #define BOOT_CODE_FILENAME_3 "ka410_xs.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka410_xs_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x8000
 #define BOOT_CODE_FILENAME_4 "ka410_xs.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka410_xs_bin
diff --git a/VAX/vax_ka411_bin.h b/VAX/vax_ka411_bin.h
index 9fc0fc49..3c33d2dd 100644
--- a/VAX/vax_ka411_bin.h
+++ b/VAX/vax_ka411_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka411_bin_H
 #define ROM_vax_ka411_bin_H 0
 /*
-   VAX/vax_ka411_bin.h         produced at Mon Aug 23 12:14:03 2021
+   VAX/vax_ka411_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka411.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFECB7EE3
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka411.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka411_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka411.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka411_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka411.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka411_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka411.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka411_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka411.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka411_bin
diff --git a/VAX/vax_ka412_bin.h b/VAX/vax_ka412_bin.h
index 1b854080..288e81e5 100644
--- a/VAX/vax_ka412_bin.h
+++ b/VAX/vax_ka412_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka412_bin_H
 #define ROM_vax_ka412_bin_H 0
 /*
-   VAX/vax_ka412_bin.h         produced at Mon Aug 23 12:14:03 2021
+   VAX/vax_ka412_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka412.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFED96BB4
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka412.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka412_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka412.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka412_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka412.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka412_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka412.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka412_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka412.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka412_bin
diff --git a/VAX/vax_ka41a_bin.h b/VAX/vax_ka41a_bin.h
index e9bc83f1..803f3223 100644
--- a/VAX/vax_ka41a_bin.h
+++ b/VAX/vax_ka41a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka41a_bin_H
 #define ROM_vax_ka41a_bin_H 0
 /*
-   VAX/vax_ka41a_bin.h         produced at Mon Aug 23 12:14:03 2021
+   VAX/vax_ka41a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka41a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFECBAD2E
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka41a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka41a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka41a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka41a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka41a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka41a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka41a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka41a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka41a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka41a_bin
diff --git a/VAX/vax_ka41d_bin.h b/VAX/vax_ka41d_bin.h
index 5a6edbbd..99c5d099 100644
--- a/VAX/vax_ka41d_bin.h
+++ b/VAX/vax_ka41d_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka41d_bin_H
 #define ROM_vax_ka41d_bin_H 0
 /*
-   VAX/vax_ka41d_bin.h         produced at Mon Aug 23 12:14:04 2021
+   VAX/vax_ka41d_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka41d.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFECB8513
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka41d.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka41d_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka41d.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka41d_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka41d.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka41d_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka41d.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka41d_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka41d.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka41d_bin
diff --git a/VAX/vax_ka420_rdrz_bin.h b/VAX/vax_ka420_rdrz_bin.h
index 0a6bf296..e913490e 100644
--- a/VAX/vax_ka420_rdrz_bin.h
+++ b/VAX/vax_ka420_rdrz_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka420_rdrz_bin_H
 #define ROM_vax_ka420_rdrz_bin_H 0
 /*
-   VAX/vax_ka420_rdrz_bin.h         produced at Mon Aug 23 12:14:07 2021
+   VAX/vax_ka420_rdrz_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka420_rdrz.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 131072 (0x20000) - checksum: 0xFF747E93
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x20000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka420_rdrz.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka420_rdrz_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x20000
 #define BOOT_CODE_FILENAME_1 "ka420_rdrz.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka420_rdrz_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x20000
 #define BOOT_CODE_FILENAME_2 "ka420_rdrz.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka420_rdrz_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x20000
 #define BOOT_CODE_FILENAME_3 "ka420_rdrz.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka420_rdrz_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x20000
 #define BOOT_CODE_FILENAME_4 "ka420_rdrz.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka420_rdrz_bin
diff --git a/VAX/vax_ka420_rzrz_bin.h b/VAX/vax_ka420_rzrz_bin.h
index 50551d94..c5cdf0e7 100644
--- a/VAX/vax_ka420_rzrz_bin.h
+++ b/VAX/vax_ka420_rzrz_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka420_rzrz_bin_H
 #define ROM_vax_ka420_rzrz_bin_H 0
 /*
-   VAX/vax_ka420_rzrz_bin.h         produced at Mon Aug 23 12:14:07 2021
+   VAX/vax_ka420_rzrz_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka420_rzrz.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 131072 (0x20000) - checksum: 0xFF7A9A51
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x20000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka420_rzrz.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka420_rzrz_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x20000
 #define BOOT_CODE_FILENAME_1 "ka420_rzrz.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka420_rzrz_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x20000
 #define BOOT_CODE_FILENAME_2 "ka420_rzrz.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka420_rzrz_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x20000
 #define BOOT_CODE_FILENAME_3 "ka420_rzrz.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka420_rzrz_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x20000
 #define BOOT_CODE_FILENAME_4 "ka420_rzrz.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka420_rzrz_bin
diff --git a/VAX/vax_ka42a_bin.h b/VAX/vax_ka42a_bin.h
index fa8b4921..c319fd95 100644
--- a/VAX/vax_ka42a_bin.h
+++ b/VAX/vax_ka42a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka42a_bin_H
 #define ROM_vax_ka42a_bin_H 0
 /*
-   VAX/vax_ka42a_bin.h         produced at Mon Aug 23 12:14:04 2021
+   VAX/vax_ka42a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka42a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFED8967F
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka42a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka42a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka42a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka42a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka42a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka42a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka42a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka42a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka42a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka42a_bin
diff --git a/VAX/vax_ka42b_bin.h b/VAX/vax_ka42b_bin.h
index 1346b70c..7c79fd58 100644
--- a/VAX/vax_ka42b_bin.h
+++ b/VAX/vax_ka42b_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka42b_bin_H
 #define ROM_vax_ka42b_bin_H 0
 /*
-   VAX/vax_ka42b_bin.h         produced at Mon Aug 23 12:14:05 2021
+   VAX/vax_ka42b_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka42b.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFECBB2EF
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka42b.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka42b_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka42b.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka42b_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka42b.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka42b_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka42b.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka42b_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka42b.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka42b_bin
diff --git a/VAX/vax_ka43a_bin.h b/VAX/vax_ka43a_bin.h
index 8804b94c..afeff3e3 100644
--- a/VAX/vax_ka43a_bin.h
+++ b/VAX/vax_ka43a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka43a_bin_H
 #define ROM_vax_ka43a_bin_H 0
 /*
-   VAX/vax_ka43a_bin.h         produced at Mon Aug 23 12:14:05 2021
+   VAX/vax_ka43a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka43a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFEAB1DF9
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka43a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka43a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka43a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka43a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka43a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka43a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka43a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka43a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka43a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka43a_bin
diff --git a/VAX/vax_ka46a_bin.h b/VAX/vax_ka46a_bin.h
index 8234641a..72826372 100644
--- a/VAX/vax_ka46a_bin.h
+++ b/VAX/vax_ka46a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka46a_bin_H
 #define ROM_vax_ka46a_bin_H 0
 /*
-   VAX/vax_ka46a_bin.h         produced at Mon Aug 23 12:14:05 2021
+   VAX/vax_ka46a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka46a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFE8D094C
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka46a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka46a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka46a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka46a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka46a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka46a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka46a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka46a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka46a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka46a_bin
diff --git a/VAX/vax_ka47a_bin.h b/VAX/vax_ka47a_bin.h
index 4a5b4127..b90ba706 100644
--- a/VAX/vax_ka47a_bin.h
+++ b/VAX/vax_ka47a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka47a_bin_H
 #define ROM_vax_ka47a_bin_H 0
 /*
-   VAX/vax_ka47a_bin.h         produced at Mon Aug 23 12:14:06 2021
+   VAX/vax_ka47a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka47a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFE8D8DDA
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka47a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka47a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka47a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka47a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka47a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka47a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka47a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka47a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka47a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka47a_bin
diff --git a/VAX/vax_ka48a_bin.h b/VAX/vax_ka48a_bin.h
index f7c0abac..393e6c13 100644
--- a/VAX/vax_ka48a_bin.h
+++ b/VAX/vax_ka48a_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka48a_bin_H
 #define ROM_vax_ka48a_bin_H 0
 /*
-   VAX/vax_ka48a_bin.h         produced at Mon Aug 23 12:14:06 2021
+   VAX/vax_ka48a_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka48a.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 262144 (0x40000) - checksum: 0xFEBB854D
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x40000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka48a.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka48a_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x40000
 #define BOOT_CODE_FILENAME_1 "ka48a.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka48a_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x40000
 #define BOOT_CODE_FILENAME_2 "ka48a.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka48a_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x40000
 #define BOOT_CODE_FILENAME_3 "ka48a.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka48a_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x40000
 #define BOOT_CODE_FILENAME_4 "ka48a.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka48a_bin
diff --git a/VAX/vax_ka4xx_4pln_bin.h b/VAX/vax_ka4xx_4pln_bin.h
index c01679a8..b8497741 100644
--- a/VAX/vax_ka4xx_4pln_bin.h
+++ b/VAX/vax_ka4xx_4pln_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka4xx_4pln_bin_H
 #define ROM_vax_ka4xx_4pln_bin_H 0
 /*
-   VAX/vax_ka4xx_4pln_bin.h         produced at Mon Aug 23 12:14:07 2021
+   VAX/vax_ka4xx_4pln_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka4xx_4pln.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 65536 (0x10000) - checksum: 0xFF9CD286
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x10000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka4xx_4pln.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka4xx_4pln_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x10000
 #define BOOT_CODE_FILENAME_1 "ka4xx_4pln.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka4xx_4pln_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x10000
 #define BOOT_CODE_FILENAME_2 "ka4xx_4pln.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka4xx_4pln_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x10000
 #define BOOT_CODE_FILENAME_3 "ka4xx_4pln.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka4xx_4pln_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x10000
 #define BOOT_CODE_FILENAME_4 "ka4xx_4pln.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka4xx_4pln_bin
diff --git a/VAX/vax_ka4xx_8pln_bin.h b/VAX/vax_ka4xx_8pln_bin.h
index d6a6726d..0b0a0060 100644
--- a/VAX/vax_ka4xx_8pln_bin.h
+++ b/VAX/vax_ka4xx_8pln_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka4xx_8pln_bin_H
 #define ROM_vax_ka4xx_8pln_bin_H 0
 /*
-   VAX/vax_ka4xx_8pln_bin.h         produced at Mon Aug 23 12:14:08 2021
+   VAX/vax_ka4xx_8pln_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka4xx_8pln.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 65536 (0x10000) - checksum: 0xFFA2FF59
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x10000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka4xx_8pln.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka4xx_8pln_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x10000
 #define BOOT_CODE_FILENAME_1 "ka4xx_8pln.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka4xx_8pln_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x10000
 #define BOOT_CODE_FILENAME_2 "ka4xx_8pln.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka4xx_8pln_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x10000
 #define BOOT_CODE_FILENAME_3 "ka4xx_8pln.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka4xx_8pln_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x10000
 #define BOOT_CODE_FILENAME_4 "ka4xx_8pln.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka4xx_8pln_bin
diff --git a/VAX/vax_ka4xx_dz_bin.h b/VAX/vax_ka4xx_dz_bin.h
index 4e799102..1702fd9b 100644
--- a/VAX/vax_ka4xx_dz_bin.h
+++ b/VAX/vax_ka4xx_dz_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka4xx_dz_bin_H
 #define ROM_vax_ka4xx_dz_bin_H 0
 /*
-   VAX/vax_ka4xx_dz_bin.h         produced at Mon Aug 23 12:14:08 2021
+   VAX/vax_ka4xx_dz_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka4xx_dz.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 32768 (0x8000) - checksum: 0xFFD84C02
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x8000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka4xx_dz.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka4xx_dz_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x8000
 #define BOOT_CODE_FILENAME_1 "ka4xx_dz.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka4xx_dz_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x8000
 #define BOOT_CODE_FILENAME_2 "ka4xx_dz.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka4xx_dz_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x8000
 #define BOOT_CODE_FILENAME_3 "ka4xx_dz.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka4xx_dz_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x8000
 #define BOOT_CODE_FILENAME_4 "ka4xx_dz.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka4xx_dz_bin
diff --git a/VAX/vax_ka4xx_spx_bin.h b/VAX/vax_ka4xx_spx_bin.h
index 823d3d84..de094458 100644
--- a/VAX/vax_ka4xx_spx_bin.h
+++ b/VAX/vax_ka4xx_spx_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka4xx_spx_bin_H
 #define ROM_vax_ka4xx_spx_bin_H 0
 /*
-   VAX/vax_ka4xx_spx_bin.h         produced at Mon Aug 23 12:14:08 2021
+   VAX/vax_ka4xx_spx_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/ka4xx_spx.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 131072 (0x20000) - checksum: 0xFF765752
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x20000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka4xx_spx.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka4xx_spx_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x20000
 #define BOOT_CODE_FILENAME_1 "ka4xx_spx.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka4xx_spx_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x20000
 #define BOOT_CODE_FILENAME_2 "ka4xx_spx.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka4xx_spx_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x20000
 #define BOOT_CODE_FILENAME_3 "ka4xx_spx.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka4xx_spx_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x20000
 #define BOOT_CODE_FILENAME_4 "ka4xx_spx.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka4xx_spx_bin
diff --git a/VAX/vax_ka610_bin.h b/VAX/vax_ka610_bin.h
index 4b4e188e..a5210351 100644
--- a/VAX/vax_ka610_bin.h
+++ b/VAX/vax_ka610_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka610_bin_H
 #define ROM_vax_ka610_bin_H 0
 /*
-   VAX/vax_ka610_bin.h         produced at Mon Aug 23 12:14:02 2021
+   VAX/vax_ka610_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka610.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 16384 (0x4000) - checksum: 0xFFEF3312
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x4000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka610.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka610_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x4000
 #define BOOT_CODE_FILENAME_1 "ka610.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka610_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x4000
 #define BOOT_CODE_FILENAME_2 "ka610.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka610_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x4000
 #define BOOT_CODE_FILENAME_3 "ka610.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka610_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x4000
 #define BOOT_CODE_FILENAME_4 "ka610.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka610_bin
diff --git a/VAX/vax_ka620_bin.h b/VAX/vax_ka620_bin.h
index 0302eb77..8bb63ae2 100644
--- a/VAX/vax_ka620_bin.h
+++ b/VAX/vax_ka620_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka620_bin_H
 #define ROM_vax_ka620_bin_H 0
 /*
-   VAX/vax_ka620_bin.h         produced at Mon Aug 23 12:14:02 2021
+   VAX/vax_ka620_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka620.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 65536 (0x10000) - checksum: 0xFF7F930F
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x10000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka620.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka620_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x10000
 #define BOOT_CODE_FILENAME_1 "ka620.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka620_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x10000
 #define BOOT_CODE_FILENAME_2 "ka620.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka620_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x10000
 #define BOOT_CODE_FILENAME_3 "ka620.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka620_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x10000
 #define BOOT_CODE_FILENAME_4 "ka620.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka620_bin
diff --git a/VAX/vax_ka630_bin.h b/VAX/vax_ka630_bin.h
index b85cf450..2ddfd9c8 100644
--- a/VAX/vax_ka630_bin.h
+++ b/VAX/vax_ka630_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka630_bin_H
 #define ROM_vax_ka630_bin_H 0
 /*
-   VAX/vax_ka630_bin.h         produced at Mon Aug 23 12:14:02 2021
+   VAX/vax_ka630_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka630.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 65536 (0x10000) - checksum: 0xFF7F73EF
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x10000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka630.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka630_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x10000
 #define BOOT_CODE_FILENAME_1 "ka630.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka630_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x10000
 #define BOOT_CODE_FILENAME_2 "ka630.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka630_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x10000
 #define BOOT_CODE_FILENAME_3 "ka630.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka630_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x10000
 #define BOOT_CODE_FILENAME_4 "ka630.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka630_bin
diff --git a/VAX/vax_ka655x_bin.h b/VAX/vax_ka655x_bin.h
index d19d455f..233542d2 100644
--- a/VAX/vax_ka655x_bin.h
+++ b/VAX/vax_ka655x_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_ka655x_bin_H
 #define ROM_vax_ka655x_bin_H 0
 /*
-   VAX/vax_ka655x_bin.h         produced at Mon Aug 23 12:14:02 2021
+   VAX/vax_ka655x_bin.h         produced at Mon Aug 23 13:30:20 2021
    from VAX/ka655x.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 131072 (0x20000) - checksum: 0xFF7673B6
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x20000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "ka655x.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_ka655x_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x20000
 #define BOOT_CODE_FILENAME_1 "ka655x.bin"
 #define BOOT_CODE_ARRAY_1 vax_ka655x_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x20000
 #define BOOT_CODE_FILENAME_2 "ka655x.bin"
 #define BOOT_CODE_ARRAY_2 vax_ka655x_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x20000
 #define BOOT_CODE_FILENAME_3 "ka655x.bin"
 #define BOOT_CODE_ARRAY_3 vax_ka655x_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x20000
 #define BOOT_CODE_FILENAME_4 "ka655x.bin"
 #define BOOT_CODE_ARRAY_4 vax_ka655x_bin
diff --git a/VAX/vax_vcb02_bin.h b/VAX/vax_vcb02_bin.h
index 9adfc0ec..d4d4af68 100644
--- a/VAX/vax_vcb02_bin.h
+++ b/VAX/vax_vcb02_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_vax_vcb02_bin_H
 #define ROM_vax_vcb02_bin_H 0
 /*
-   VAX/vax_vcb02_bin.h         produced at Mon Aug 23 12:14:08 2021
+   VAX/vax_vcb02_bin.h         produced at Mon Aug 23 13:30:21 2021
    from VAX/vcb02.bin which was last modified at Mon Jul 26 08:03:31 2021
    file size: 16384 (0x4000) - checksum: 0xFFF1D2AD
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x4000
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "vcb02.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY vax_vcb02_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x4000
 #define BOOT_CODE_FILENAME_1 "vcb02.bin"
 #define BOOT_CODE_ARRAY_1 vax_vcb02_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x4000
 #define BOOT_CODE_FILENAME_2 "vcb02.bin"
 #define BOOT_CODE_ARRAY_2 vax_vcb02_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x4000
 #define BOOT_CODE_FILENAME_3 "vcb02.bin"
 #define BOOT_CODE_ARRAY_3 vax_vcb02_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x4000
 #define BOOT_CODE_FILENAME_4 "vcb02.bin"
 #define BOOT_CODE_ARRAY_4 vax_vcb02_bin
diff --git a/sim_BuildROMs.c b/sim_BuildROMs.c
index b0526a59..e92c67c7 100644
--- a/sim_BuildROMs.c
+++ b/sim_BuildROMs.c
@@ -351,13 +351,14 @@ fprintf (iFile, "   This file is a generated file and should NOT be edited or ch
 if (Comments)
     fprintf (iFile, "\n   %s\r\n\r\n", Comments);
 fprintf (iFile, "*/\r\n");
-fprintf (iFile, "#if !defined BOOT_CODE_SIZE\r\n");
+fprintf (iFile, "#undef BOOT_CODE_SIZE\r\n");
 fprintf (iFile, "#define BOOT_CODE_SIZE 0x%X\r\n", (int)statb.st_size);
+fprintf (iFile, "#undef BOOT_CODE_FILENAME\r\n");
 fprintf (iFile, "#define BOOT_CODE_FILENAME \"%s\"\r\n", load_filename);
+fprintf (iFile, "#undef BOOT_CODE_ARRAY\r\n");
 fprintf (iFile, "#define BOOT_CODE_ARRAY %s\r\n", rom_array_name);
-fprintf (iFile, "#endif\r\n");
 for (rom = 1; rom <= MAX_CONCURRENT_ROMS; rom++) {
-    fprintf (iFile, "%s !defined BOOT_CODE_SIZE_%d\r\n", (rom == 1) ? "#if" : "#elif", rom);
+    fprintf (iFile, "%s !defined(BOOT_CODE_SIZE_%d)\r\n", (rom == 1) ? "#if" : "#elif", rom);
     fprintf (iFile, "#define BOOT_CODE_SIZE_%d 0x%X\r\n", rom, (int)statb.st_size);
     fprintf (iFile, "#define BOOT_CODE_FILENAME_%d \"%s\"\r\n", rom, load_filename);
     fprintf (iFile, "#define BOOT_CODE_ARRAY_%d %s\r\n", rom, rom_array_name);
diff --git a/swtp6800/swtp6800/swtp_swtbug_bin.h b/swtp6800/swtp6800/swtp_swtbug_bin.h
index 9deddd2e..07cad98b 100644
--- a/swtp6800/swtp6800/swtp_swtbug_bin.h
+++ b/swtp6800/swtp6800/swtp_swtbug_bin.h
@@ -1,29 +1,30 @@
 #ifndef ROM_swtp_swtbug_bin_H
 #define ROM_swtp_swtbug_bin_H 0
 /*
-   swtp6800/swtp6800/swtp_swtbug_bin.h         produced at Mon Aug 23 12:14:08 2021
+   swtp6800/swtp6800/swtp_swtbug_bin.h         produced at Mon Aug 23 13:30:22 2021
    from swtp6800/swtp6800/swtbug.bin which was last modified at Mon Jul 26 08:03:32 2021
    file size: 1024 (0x400) - checksum: 0xFFFE4FBC
    This file is a generated file and should NOT be edited or changed by hand.
 */
-#if !defined BOOT_CODE_SIZE
+#undef BOOT_CODE_SIZE
 #define BOOT_CODE_SIZE 0x400
+#undef BOOT_CODE_FILENAME
 #define BOOT_CODE_FILENAME "swtbug.bin"
+#undef BOOT_CODE_ARRAY
 #define BOOT_CODE_ARRAY swtp_swtbug_bin
-#endif
-#if !defined BOOT_CODE_SIZE_1
+#if !defined(BOOT_CODE_SIZE_1)
 #define BOOT_CODE_SIZE_1 0x400
 #define BOOT_CODE_FILENAME_1 "swtbug.bin"
 #define BOOT_CODE_ARRAY_1 swtp_swtbug_bin
-#elif !defined BOOT_CODE_SIZE_2
+#elif !defined(BOOT_CODE_SIZE_2)
 #define BOOT_CODE_SIZE_2 0x400
 #define BOOT_CODE_FILENAME_2 "swtbug.bin"
 #define BOOT_CODE_ARRAY_2 swtp_swtbug_bin
-#elif !defined BOOT_CODE_SIZE_3
+#elif !defined(BOOT_CODE_SIZE_3)
 #define BOOT_CODE_SIZE_3 0x400
 #define BOOT_CODE_FILENAME_3 "swtbug.bin"
 #define BOOT_CODE_ARRAY_3 swtp_swtbug_bin
-#elif !defined BOOT_CODE_SIZE_4
+#elif !defined(BOOT_CODE_SIZE_4)
 #define BOOT_CODE_SIZE_4 0x400
 #define BOOT_CODE_FILENAME_4 "swtbug.bin"
 #define BOOT_CODE_ARRAY_4 swtp_swtbug_bin