New directory

105 files changed, 0 insertions, 306 deletions

diff --git a/src/s/386-ix.h b/src/s/386-ix.h
index 33658dd65e6..dc17281df01 100644
--- a/src/s/386-ix.h
+++ b/src/s/386-ix.h
@@ -13,6 +13,3 @@
 /* This is said to be needed as a result of having _insque rather
    than insque in -loldX.  This may not always be the right thing.  */
 #define WRONG_NAME_INSQUE
-
-/* arch-tag: c2fc2d64-46fd-4a87-933b-85eff622829c
-   (do not change this comment) */
diff --git a/src/s/386bsd.h b/src/s/386bsd.h
index 706fbf23acb..427dc2003de 100644
--- a/src/s/386bsd.h
+++ b/src/s/386bsd.h
@@ -22,6 +22,3 @@
 
 /* This affects a declaration in xrdb.c.  */
 #define DECLARE_GETPWUID_WITH_UID_T
-
-/* arch-tag: 8a114892-0863-4285-a4cb-3d66ba2d8e7b
-   (do not change this comment) */
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index b96bf4373b3..330cbae4279 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -213,5 +213,3 @@ Boston, MA 02111-1307, USA.  */
 /* For unexaix.c. */
 #define ALIGN_DATA_RELOC
 
-/* arch-tag: bfff798c-542d-4290-91f2-267394c85b7b
-   (do not change this comment) */
diff --git a/src/s/aix3-2-5.h b/src/s/aix3-2-5.h
index 6c8458cc8a4..04c8ccf44ad 100644
--- a/src/s/aix3-2-5.h
+++ b/src/s/aix3-2-5.h
@@ -28,6 +28,3 @@
 /* Bill Woodward <wpwood@austin.ibm.com> says:
    libIM *must* precede libXm, to avoid getting aixLoadIM error messages.  */
 #define LIB_MOTIF -lIM -lXm
-
-/* arch-tag: 692b3acb-5383-4cfb-93f6-378b5c48c75e
-   (do not change this comment) */
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index 6dfbe5d751c..b8e5bd6d65b 100644
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -49,6 +49,3 @@
    lose declaring char * rindex without this.
    It is just a guess which versions of AIX need this definition.  */
 #undef HAVE_STRING_H
-
-/* arch-tag: 0935754d-67e1-4697-978a-3e9976da05c3
-   (do not change this comment) */
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index 21d05cb154d..e179684f3b6 100644
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -40,6 +40,3 @@
 /* Unfortunately without libXmu we cannot support EditRes.  */
 #define NO_EDITRES
 #endif
-
-/* arch-tag: 72d598e1-bc3e-48e0-bfd2-693917c3738e
-   (do not change this comment) */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 66b7d322b56..fbc20b24a58 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,3 @@
 #include "aix4-1.h"
 
 #undef ALIGN_DATA_RELOC
-
-/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
-   (do not change this comment) */
diff --git a/src/s/aix4.h b/src/s/aix4.h
index b2ed15f75ea..5e1be65241e 100644
--- a/src/s/aix4.h
+++ b/src/s/aix4.h
@@ -12,6 +12,3 @@
 /* Specify the type that the 3rd arg of `accept' points to.
    It is just a guess which versions of AIX need this definition.  */
 #define SOCKLEN_TYPE int
-
-/* arch-tag: b9471dfc-ccdc-4980-a8a1-80c7627ec6b2
-   (do not change this comment) */
diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index 30833b5ff9a..99280daf832 100644
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -43,6 +43,3 @@
 #endif
 
 #define GETPGRP_NO_ARG 1
-
-/* arch-tag: 867e3bb8-e9df-4763-9c82-8f4accb8209e
-   (do not change this comment) */
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 624f7090f80..fc797755c08 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -127,6 +127,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Special library needed for linking for 4.1.  */
 #define LIBS_SYSTEM -ljobs
-
-/* arch-tag: de56716a-ed9b-4851-a5c5-c882efaf9931
-   (do not change this comment) */
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index e39a8c81948..27ad9a5fe6e 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -118,6 +118,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 38ca640f-549e-4726-a257-71048ab4c480
-   (do not change this comment) */
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index f5db6fbb5cd..46cb3a53528 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -118,5 +118,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define SIGNALS_VIA_CHARACTERS
 
-/* arch-tag: 0c367245-bde3-492e-9029-3ff6898beb95
-   (do not change this comment) */
diff --git a/src/s/bsdos2-1.h b/src/s/bsdos2-1.h
index 244d58f5137..7a8b6630d02 100644
--- a/src/s/bsdos2-1.h
+++ b/src/s/bsdos2-1.h
@@ -4,6 +4,3 @@
 
 #undef LIB_X11_LIB
 #define LIB_X11_LIB -L/usr/X11/lib -lX11 -lipc
-
-/* arch-tag: cf1ada4a-cdbf-452b-a264-ff84dd523e97
-   (do not change this comment) */
diff --git a/src/s/bsdos2.h b/src/s/bsdos2.h
index 9e1e82fd75a..a6970b65491 100644
--- a/src/s/bsdos2.h
+++ b/src/s/bsdos2.h
@@ -9,6 +9,3 @@
 
 #undef  KERNEL_FILE
 #define KERNEL_FILE     "/bsd"
-
-/* arch-tag: 25ce1827-1511-4305-9058-24dd2118b5b4
-   (do not change this comment) */
diff --git a/src/s/bsdos3.h b/src/s/bsdos3.h
index 20a9704e14f..faa5f821e20 100644
--- a/src/s/bsdos3.h
+++ b/src/s/bsdos3.h
@@ -4,6 +4,3 @@
 
 #undef  LIBS_SYSTEM
 #define LIBS_SYSTEM -lkvm
-
-/* arch-tag: 726766f3-5a62-48bf-8e21-3b21ec6abe6f
-   (do not change this comment) */
diff --git a/src/s/bsdos4.h b/src/s/bsdos4.h
index 540e4a7d790..6c3e498deb8 100644
--- a/src/s/bsdos4.h
+++ b/src/s/bsdos4.h
@@ -21,6 +21,3 @@
 #define LIB_GCC
 
 #endif /* not __ELF__ */
-
-/* arch-tag: 7659632a-a879-4153-bb8b-3765a1463ca1
-   (do not change this comment) */
diff --git a/src/s/cxux.h b/src/s/cxux.h
index fd8b00ff2b4..c39f2413cc2 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -230,6 +230,3 @@ Boston, MA 02111-1307, USA.  */
    Note that emacs carefully avoids static vars inside functions.  */
 
 /* #define static */
-
-/* arch-tag: 5febe5fe-f0b0-49cb-9280-9d5a9fa43710
-   (do not change this comment) */
diff --git a/src/s/cxux7.h b/src/s/cxux7.h
index b9ecf45f6bb..83323a98642 100644
--- a/src/s/cxux7.h
+++ b/src/s/cxux7.h
@@ -5,6 +5,3 @@
 #define USING_CX_UX_7
 
 #include "cxux.h"
-
-/* arch-tag: 520cfbad-fd5c-4b3b-ace4-66e9bcd31a60
-   (do not change this comment) */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 033eb636966..d10a7264053 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -144,6 +144,3 @@ Boston, MA 02111-1307, USA.  */
 #define vfork fork
 
 /* the end */
-
-/* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
-   (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 5f2aa0ca309..e9faa6605ce 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -316,6 +316,3 @@ struct kboard;
 #if defined (HAVE_CARBON) && (defined (emacs) || defined (temacs))
 #define select sys_select
 #endif
-
-/* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
-   (do not change this comment) */
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 4c4a84d9996..95dee6b2571 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -349,6 +349,3 @@ extern struct sigaction act, oact;
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 1b6d117d-82d2-4480-a6d0-3f7a8360f658
-   (do not change this comment) */
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 7a1eaf42105..188429c1aee 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -137,6 +137,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define PENDING_OUTPUT_COUNT(FILE) (1)
 
 #endif /* NOT_C_CODE */
-
-/* arch-tag: c7013e7b-6e2e-44f2-ba61-90b6d5e2ea45
-   (do not change this comment) */
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index 3d4c4775c91..8091b9f88cc 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -62,6 +62,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is needed according to Ehud Karni <ehud@unix.simonwiesel.co.il>
    for m88k-dg-dgux5.4R3.10.  */
 #undef BSD_PGRPS
-
-/* arch-tag: c11938c9-0cb0-4652-88aa-7eb80bf1cda9
-   (do not change this comment) */
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index 7121f5e18a3..1eaeccdf269 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -45,6 +45,3 @@ Boston, MA 02111-1307, USA.  */
           caused trouble on DGUX 5.4.2.  */
 #define LIBS_SYSTEM -ldgc
 #endif
-
-/* arch-tag: a14f4043-6caa-4f01-a9b9-ae0fb0d2c96e
-   (do not change this comment) */
diff --git a/src/s/domain.h b/src/s/domain.h
index ebcdc7ea365..dc57f8ff9a3 100644
--- a/src/s/domain.h
+++ b/src/s/domain.h
@@ -2,6 +2,3 @@
 
 /* Inhibit using -X, which is the default.  */
 #define LD_SWITCH_SYSTEM
-
-/* arch-tag: 08941c4f-d0b6-4ad6-b7e3-7e7fe76c0e94
-   (do not change this comment) */
diff --git a/src/s/esix.h b/src/s/esix.h
index 357e7736476..64d0822bf5f 100644
--- a/src/s/esix.h
+++ b/src/s/esix.h
@@ -22,6 +22,3 @@
 #define NO_SIOCTL_H
 #define NEED_PTEM_H
 #define BROKEN_FIONREAD
-
-/* arch-tag: d66e6a70-0812-437d-aa35-9b01bd474941
-   (do not change this comment) */
diff --git a/src/s/esix5r4.h b/src/s/esix5r4.h
index 4240f3d7f4a..d8cf0184f3a 100644
--- a/src/s/esix5r4.h
+++ b/src/s/esix5r4.h
@@ -22,6 +22,3 @@
 /* zircon!joe says this makes X windows work.  */
 # define BROKEN_FIONREAD
 #endif
-
-/* arch-tag: 2d314ae9-0357-4ddf-96e5-cf821071ba4b
-   (do not change this comment) */
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index f3049724d12..94336835f50 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -68,9 +68,6 @@ Boston, MA 02111-1307, USA.  */
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
-#else
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
 #endif
 
 #define SYSV_SYSTEM_DIR
@@ -219,6 +216,3 @@ Boston, MA 02111-1307, USA.  */
    of sigblock says it is obsolete.  */
 
 #define POSIX_SIGNALS           1
-
-/* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
-   (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index efdc2bc00ef..ac0ad0b014d 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -362,6 +362,3 @@ Boston, MA 02111-1307, USA.  */
 #define GC_LISP_OBJECT_ALIGNMENT 2
 #endif
 #endif
-
-/* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
-   (do not change this comment) */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index f7fb4899db9..807ff80378b 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */
-
-/* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
-   (do not change this comment) */
diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 04e0bd4f72c..5175bd10bfe 100644
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -42,5 +42,3 @@
 #undef LDAV_SYMBOL
 #define LDAV_SYMBOL "avenrun"
 
-/* arch-tag: c5422584-cd86-4e10-8089-9f604523dab7
-   (do not change this comment) */
diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h
index 004ddd95043..5175bd10bfe 100644
--- a/src/s/hiuxwe2.h
+++ b/src/s/hiuxwe2.h
@@ -42,5 +42,3 @@
 #undef LDAV_SYMBOL
 #define LDAV_SYMBOL "avenrun"
 
-/* arch-tag: c56449e1-6d1b-4537-a596-0b08b8e4ec73
-   (do not change this comment) */
diff --git a/src/s/hpux.h b/src/s/hpux.h
index debf6aad6d3..9a2e7e845f8 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -221,6 +221,3 @@ Boston, MA 02111-1307, USA.  */
 /* It's possible that HPUX 7 has sys/wait.h but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
 #endif
-
-/* arch-tag: 75c1239f-fedb-4f64-8f86-7893e75699e8
-   (do not change this comment) */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index a15b81a5e90..8e661188d72 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -9,5 +9,3 @@
    don't exist from 10.20 on (see process.c) */
 #undef POLL_INTERRUPTED_SYS_CALL
 
-/* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
-   (do not change this comment) */
diff --git a/src/s/hpux10.h b/src/s/hpux10.h
index 3612cfe0027..ba0a11ff60d 100644
--- a/src/s/hpux10.h
+++ b/src/s/hpux10.h
@@ -60,6 +60,3 @@
    Causes "poll: interrupted system call" messages when Emacs is run
    in an X window (see process.c) */
 #define POLL_INTERRUPTED_SYS_CALL
-
-/* arch-tag: 1b95d569-a3c1-4fb0-8f69-fef264c17c24
-   (do not change this comment) */
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 7bd4afb116b..1d49d6eedca 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -13,6 +13,3 @@
 /* It does work on HPUX to open the pty's tty in the parent (Emacs),
    then close and reopen it in the child.  */
 #define USG_SUBTTY_WORKS
-
-/* arch-tag: f5a3d780-82cd-4a9a-832e-a4031aab788b
-   (do not change this comment) */
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index e73c630e825..a151769fcf9 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -69,6 +69,3 @@
 
 /* Enable a special hack in XTread_socket.  */
 #define X_IO_BUG
-
-/* arch-tag: 25fafe5c-b26c-43ab-8144-1629d59207ee
-   (do not change this comment) */
diff --git a/src/s/hpux9-x11r4.h b/src/s/hpux9-x11r4.h
index 6a701d5a412..7d321162eae 100644
--- a/src/s/hpux9-x11r4.h
+++ b/src/s/hpux9-x11r4.h
@@ -8,5 +8,3 @@
 #undef  LD_SWITCH_X_DEFAULT
 #define LD_SWITCH_X_DEFAULT -L/usr/lib/Motif1.1
 
-/* arch-tag: 47664d7b-23ce-43e6-acdd-044a4be08da3
-   (do not change this comment) */
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index 7562c6ae7ef..d73d3b7ce8d 100644
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -71,5 +71,3 @@
 #undef HAVE_RINT
 
 
-/* arch-tag: 0a5e9f05-012c-4962-a222-a7a3a7fe0ab7
-   (do not change this comment) */
diff --git a/src/s/hpux9shr.h b/src/s/hpux9shr.h
index d273d2e7787..41ef98741c0 100644
--- a/src/s/hpux9shr.h
+++ b/src/s/hpux9shr.h
@@ -11,6 +11,3 @@
 #define C_DEBUG_SWITCH
 #endif
 #endif
-
-/* arch-tag: 1b259627-c5f6-4260-866f-781b06d72f6b
-   (do not change this comment) */
diff --git a/src/s/hpux9shxr4.h b/src/s/hpux9shxr4.h
index 63810273698..7f59f64b777 100644
--- a/src/s/hpux9shxr4.h
+++ b/src/s/hpux9shxr4.h
@@ -6,5 +6,3 @@
 #undef  LD_SWITCH_X_DEFAULT
 #define LD_SWITCH_X_DEFAULT -L/usr/lib/Motif1.1
 
-/* arch-tag: 7f68b8b6-c733-4e6c-81df-39d8d13fb656
-   (do not change this comment) */
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 51391d56e9d..1b8e045ce79 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -160,6 +160,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
-
-/* arch-tag: 41161051-477f-44be-bb2a-0eead3142157
-   (do not change this comment) */
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 50d0962e48f..56e0e06fefc 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -157,6 +157,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
-
-/* arch-tag: cdf2033e-a2d5-43e1-a1a2-a7243cf41a11
-   (do not change this comment) */
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index fad50aa20f8..1d02c5c3270 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -150,6 +150,3 @@ Boston, MA 02111-1307, USA.  */
 /* This was formerly in LIBS_MACHINE in iris4d.h,
    but it is not needed for newer system versions.  */
 #define LIBS_SYSTEM -lsun
-
-/* arch-tag: cccdd761-2ae9-4e71-a33e-749681c01889
-   (do not change this comment) */
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 215cbdc32de..4144c34d9af 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -51,6 +51,3 @@
     return -1;                                                  \
   strcpy (pty_name, name);                                      \
 }
-
-/* arch-tag: cfd7e200-a4dc-4f67-9a32-4184c10b0c57
-   (do not change this comment) */
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index 91017fb56d2..1bdd479eb9f 100644
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -113,6 +113,3 @@ char *_getpty();
 #define NARROWPROTO 1
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
-   (do not change this comment) */
diff --git a/src/s/irix5-2.h b/src/s/irix5-2.h
index b9cca67acdf..a9056fae8c1 100644
--- a/src/s/irix5-2.h
+++ b/src/s/irix5-2.h
@@ -16,6 +16,3 @@
    for jpff@maths.bath.ac.uk.
    Note that irix6-0.h does not include this file, only irix5-0.h.  */
 #define NO_WTMP_FILE
-
-/* arch-tag: e2f820c1-2a3e-4cee-b5f1-6ce8ab21f439
-   (do not change this comment) */
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index e60120d3f6a..ef86c975573 100644
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -35,6 +35,3 @@
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: a775e465-a619-4655-a58f-5982aad0c624
-   (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index c1cc42a8c0e..7e29dc284b1 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -32,6 +32,3 @@
 #undef ospeed
 
 #undef TIOCSIGSEND              /* defined in usg5-4.h */
-
-/* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
-   (do not change this comment) */
diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index 88f216b77d8..f669fc2c141 100644
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -75,6 +75,3 @@
 /* Some versions of ISC are said to define S_IFLNK even tho
    they don't really support symlinks.  */
 #undef S_IFLNK
-
-/* arch-tag: 4de02713-eac5-4360-9d36-fd82c7a3ae44
-   (do not change this comment) */
diff --git a/src/s/isc3-0.h b/src/s/isc3-0.h
index bbd4e8609d1..327f605ff7e 100644
--- a/src/s/isc3-0.h
+++ b/src/s/isc3-0.h
@@ -44,6 +44,3 @@
    It won't be needed for 4.1.  */
 #define EXTRA_INITIALIZE __setostype (0)
 #endif
-
-/* arch-tag: c1aca3f2-813d-4c1c-ad64-ca6c20ec9bfb
-   (do not change this comment) */
diff --git a/src/s/isc4-0.h b/src/s/isc4-0.h
index d180b5d182c..ccd6cb0627f 100644
--- a/src/s/isc4-0.h
+++ b/src/s/isc4-0.h
@@ -28,6 +28,3 @@
       sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL))
 #endif
 #endif /* not POSIX_SIGNALS */
-
-/* arch-tag: 1278f86f-17f2-462d-88c9-85e4b5faa5c3
-   (do not change this comment) */
diff --git a/src/s/isc4-1.h b/src/s/isc4-1.h
index c37537e629c..df549b9fb7b 100644
--- a/src/s/isc4-1.h
+++ b/src/s/isc4-1.h
@@ -30,6 +30,3 @@
 
 /* ISC 4.1 has sys/wait.h but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
-
-/* arch-tag: ec5c77d9-a330-4d93-8117-d2b374531c67
-   (do not change this comment) */
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 017e1892c10..576c4093c51 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -54,6 +54,3 @@ Boston, MA 02111-1307, USA.  */
 /* warning messages */
 #define C_SWITCH_SYSTEM -D__NO_INCLUDE_WARN__
 #define LIBS_SYSTEM -lbsd
-
-/* arch-tag: fbc81ec9-1c45-416b-a368-799ae7c094a1
-   (do not change this comment) */
diff --git a/src/s/mach-bsd4-3.h b/src/s/mach-bsd4-3.h
index e012679c5ff..df4640b3fc5 100644
--- a/src/s/mach-bsd4-3.h
+++ b/src/s/mach-bsd4-3.h
@@ -3,6 +3,3 @@
    you're in deep shit.  */
 
 #include "bsd4-3.h"
-
-/* arch-tag: 7f7f00f6-ae34-413e-9e6a-1d3b3e3d07e8
-   (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 09d31ed2e04..6d38d4fa592 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -492,6 +492,3 @@ extern void _DebPrint (const char *fmt, ...);
 
 
 /* ============================================================ */
-
-/* arch-tag: 5d4a3a1c-40dc-4dea-9c7c-38fed9ae0eae
-   (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index cef2184a37b..9c9205a33ad 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -275,6 +275,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
-   (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 206ff55c854..c48ac6d32fa 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -138,5 +138,3 @@
 
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
-   (do not change this comment) */
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index f4ab0597eee..7c782a40cd4 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -47,6 +47,3 @@ Boston, MA 02111-1307, USA.  */
 #ifndef HAVE_SOCKETS
 #define HAVE_SOCKETS
 #endif
-
-/* arch-tag: 2bb78fcd-fbc4-46dd-a14b-e4a9be957fe0
-   (do not change this comment) */
diff --git a/src/s/newsos6.h b/src/s/newsos6.h
index ca3dbe706d0..d4e67f7e4cf 100644
--- a/src/s/newsos6.h
+++ b/src/s/newsos6.h
@@ -4,6 +4,3 @@
 
 #define NEWSOS6
 #define HAVE_TEXT_START
-
-/* arch-tag: a0db9cb0-43bb-4f9e-85fa-384e30f02d74
-   (do not change this comment) */
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 36549e88bfa..e40cdb56ec7 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -110,6 +110,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Tell emacs.c not to define abort.  */
 #define NO_ABORT
-
-/* arch-tag: 5cd6fed4-a0be-4402-9349-85a80bc01d57
-   (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d3730324ce8..7273f48e20f 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -23,6 +23,3 @@
 #define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
 
 #endif
-
-/* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
-   (do not change this comment) */
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 61ac04c5f1f..e05f429a743 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -72,6 +72,3 @@
       emacs_close (dummy);                              \
     }                                                   \
   while (0)
-
-/* arch-tag: 65eaea67-fcc3-4de7-8574-d46beb82d4ed
-   (do not change this comment) */
diff --git a/src/s/osf5-0.h b/src/s/osf5-0.h
index 4f22f6d641b..eef028a6e3e 100644
--- a/src/s/osf5-0.h
+++ b/src/s/osf5-0.h
@@ -20,6 +20,3 @@
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 89580064-dd8c-4533-a47c-0f92d8090945
-   (do not change this comment) */
diff --git a/src/s/ptx.h b/src/s/ptx.h
index dab0f0f205f..ae76c35f3e6 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -169,6 +169,3 @@ struct timezone
 
 /* Kenneth Stailey <kstailey@eagle.dol-esa.gov> says this is needed.  */
 #define POSIX_SIGNALS
-
-/* arch-tag: 4f5e3abc-643b-413a-bae6-ed212d3af997
-   (do not change this comment) */
diff --git a/src/s/ptx4-2.h b/src/s/ptx4-2.h
index 3940093c28d..cc8e2111cf7 100644
--- a/src/s/ptx4-2.h
+++ b/src/s/ptx4-2.h
@@ -15,6 +15,3 @@
 #ifdef _MALLOC_INTERNAL
 #define _POSIX_SOURCE
 #endif
-
-/* arch-tag: 10a9fab3-9e84-4e9e-9535-6ff42baf9e77
-   (do not change this comment) */
diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index 295cb27d1a3..2505a5dfa03 100644
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -35,6 +35,3 @@
     fatal ("ioctl I_PUSH ldterm", errno);       \
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1 && errno != EINVAL) \
     fatal ("ioctl I_PUSH ttcompat", errno);
-
-/* arch-tag: 14621824-8dca-432b-a97a-049fc4ce0e9f
-   (do not change this comment) */
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 15092f59add..605ed688bcd 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -23,6 +23,3 @@ Boston, MA 02111-1307, USA.  */
 #define  RISCiX         11
 #define  CRT0_O         /lib/crt0.o
 #include "bsd4-3.h"
-
-/* arch-tag: 382df034-9843-4a82-8a3a-2e50a4dd532c
-   (do not change this comment) */
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index 988fbd61ba0..cbc78d58b95 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -23,6 +23,3 @@ Boston, MA 02111-1307, USA.  */
 #define  RISCiX         12
 #define  CRT0_O         /usr/lib/crt0.o
 #include "bsd4-3.h"
-
-/* arch-tag: f6b21e0a-f676-418a-9c8a-10fa8cd9dba7
-   (do not change this comment) */
diff --git a/src/s/riscos5.h b/src/s/riscos5.h
index 6ebf412c1d6..c4b1919bf06 100644
--- a/src/s/riscos5.h
+++ b/src/s/riscos5.h
@@ -9,6 +9,3 @@ extern double atof ();
 #define LD_SWITCH_SYSTEM -non_shared
 
 #define GETPGRP_NO_ARG
-
-/* arch-tag: e8ddf21d-72a0-476d-b33e-364f8b20e3b7
-   (do not change this comment) */
diff --git a/src/s/rtu.h b/src/s/rtu.h
index afe63b5efcc..80dccaafc8d 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -144,6 +144,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 0908970b-1cc0-4d57-b866-61b9bd029a0d
-   (do not change this comment) */
diff --git a/src/s/sco4.h b/src/s/sco4.h
index b39c7a75459..67b96eee59a 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -141,6 +141,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SOCKETS_IN_FILE_SYSTEM
 
 #define NARROWPROTO 1
-
-/* arch-tag: 4dd6fe94-bcb7-4be0-942a-ff4bc3cd914e
-   (do not change this comment) */
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 096944b833d..8b091f63b53 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -171,6 +171,3 @@ extern SIGMASKTYPE sigprocmask_set;
 #define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
 
 #define NARROWPROTO 1
-
-/* arch-tag: 930541b5-52d9-4cbe-b73c-f4c72091f5df
-   (do not change this comment) */
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index b45ec57ef1f..a4fc6097905 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -48,6 +48,3 @@
     strncpy (pty_name, ptyname, sizeof (pty_name)); \
     pty_name[sizeof (pty_name) - 1] = 0;        \
   }
-
-/* arch-tag: a8fe2e15-e517-49cb-a863-f346b80885fe
-   (do not change this comment) */
diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h
index 8ac97eaa6df..ad4fb0c5fd6 100644
--- a/src/s/sol2-4.h
+++ b/src/s/sol2-4.h
@@ -33,5 +33,3 @@
    are in this directory on Solaris 2.4.  */
 #define C_SWITCH_X_SYSTEM -I/usr/dt/include
 
-/* arch-tag: 6f0de37b-cfda-427a-a5ae-b83ed54aaae7
-   (do not change this comment) */
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index e02f0b82bc0..600ab999486 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -31,6 +31,3 @@
 /* Probably OK also on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 96d65526-21c9-4547-a797-2bd575c05be7
-   (do not change this comment) */
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index a43443e48c2..94651397658 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -6,6 +6,3 @@
 #undef UNEXEC
 #define UNEXEC unexsol.o
 #endif
-
-/* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
-   (do not change this comment) */
diff --git a/src/s/sol2.h b/src/s/sol2.h
index 5f7d781f3e3..ed82812bc67 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -51,6 +51,3 @@
 #endif
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: b0640f78-5ad5-4093-97c3-5b3abbf5a2be
-   (do not change this comment) */
diff --git a/src/s/sunos4-0.h b/src/s/sunos4-0.h
index d108df68640..0b192f8ae00 100644
--- a/src/s/sunos4-0.h
+++ b/src/s/sunos4-0.h
@@ -47,6 +47,3 @@
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 362f3bfc-810d-4f6e-9b83-5a32f8f1a926
-   (do not change this comment) */
diff --git a/src/s/sunos4-1.h b/src/s/sunos4-1.h
index 2e41c55bbfe..9c6b9cede23 100644
--- a/src/s/sunos4-1.h
+++ b/src/s/sunos4-1.h
@@ -31,6 +31,3 @@
 
 /* Define dlopen, dlclose, dlsym.  */
 #define USE_DL_STUBS
-
-/* arch-tag: 154e2eb2-2180-4d66-90b9-7e56a22004f2
-   (do not change this comment) */
diff --git a/src/s/sunos413.h b/src/s/sunos413.h
index 9f40f2fa3af..5dedb2947f6 100644
--- a/src/s/sunos413.h
+++ b/src/s/sunos413.h
@@ -11,6 +11,3 @@
 #endif
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: ebd184b0-9084-4306-8e71-c0437330e1e1
-   (do not change this comment) */
diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index 8427201cda3..d6335326bbb 100644
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -57,6 +57,3 @@
 #endif
 
 #endif  /* not HAVE_X11R6 */
-
-/* arch-tag: cb54321a-ed45-4c17-a23e-1c157758da78
-   (do not change this comment) */
diff --git a/src/s/template.h b/src/s/template.h
index e969c72e0aa..f4d806de146 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -184,6 +184,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: 4b426b11-cb2e-4c0e-a488-e663f76a0515
-   (do not change this comment) */
diff --git a/src/s/ultrix4-3.h b/src/s/ultrix4-3.h
index 2b4f379d3d1..c8d5e4a324e 100644
--- a/src/s/ultrix4-3.h
+++ b/src/s/ultrix4-3.h
@@ -11,6 +11,3 @@
 /* The address of this is used, but Ultrix header files don't declare it.  */
 extern double rint ();
 #endif
-
-/* arch-tag: 927a396a-d50f-494b-960b-533671184ce1
-   (do not change this comment) */
diff --git a/src/s/umax.h b/src/s/umax.h
index 36f5499a4b3..eaa9b6c4bbc 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -164,6 +164,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 2860edda-ce9e-4cfa-943d-3a06c7045854
-   (do not change this comment) */
diff --git a/src/s/umips.h b/src/s/umips.h
index 3d497892c4b..1b573842ea4 100644
--- a/src/s/umips.h
+++ b/src/s/umips.h
@@ -69,6 +69,3 @@
 
 /* High order bit must be stripped off nlist return values */
 #define FIXUP_KERNEL_SYMBOL_ADDR(NL)  (NL)[0].n_value &= 0x7fffffff;
-
-/* arch-tag: 9b816c7d-6ee2-40d9-b6dc-42c0aeccfbec
-   (do not change this comment) */
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0a395b22a09..9e61d3fac7c 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* A system-specific loader switch is needed.  */
 
 #define LD_SWITCH_SYSTEM -N -L/lib/libg /usr/lib/unshared.ld
-
-/* arch-tag: d3f952a9-fef5-45d5-9c1e-c1c32bfef86c
-   (do not change this comment) */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 934821dd166..a4b02531bce 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,6 +1,3 @@
 #include "usg5-4-2.h"
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
-
-/* arch-tag: d82e92e7-9443-4a60-a581-7f293cbae8a3
-   (do not change this comment) */
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index ecce9d92c76..885ad00b1ba 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -151,6 +151,3 @@ Boston, MA 02111-1307, USA.  */
 /* Prevent -lg from being used for debugging.  Not implemented?  */
 
 #define LIBS_DEBUG
-
-/* arch-tag: a18bdba9-506d-40ed-9877-49fc27ce8cac
-   (do not change this comment) */
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index a360fd64d7a..0c8e3c3d2df 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
-
-/* arch-tag: 56923f22-9e2b-4814-b922-88c87657ff6b
-   (do not change this comment) */
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 375dba75f56..e6f586da28d 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
-
-/* arch-tag: cfd9500f-0284-4a88-8f07-3f56b42db13b
-   (do not change this comment) */
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index de1a20d2658..5323bb694a6 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -205,6 +205,3 @@ Boston, MA 02111-1307, USA.  */
 /* On USG systems signal handlers return void */
 
 #define SIGTYPE void
-
-/* arch-tag: 2bca65fd-f015-44b9-a2aa-9f8170ce89ca
-   (do not change this comment) */
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index 8b11bc54eae..351d51fe29b 100644
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -54,6 +54,3 @@
 /* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
    is needed in UNIX_SV ... 4.2 1.1.2.  */
 #define LIB_MOTIF -lXm -lXimp
-
-/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
-   (do not change this comment) */
diff --git a/src/s/usg5-4-3.h b/src/s/usg5-4-3.h
index 8d05e8b3fa6..f7773cb0a13 100644
--- a/src/s/usg5-4-3.h
+++ b/src/s/usg5-4-3.h
@@ -6,6 +6,3 @@
    on start up for an i486-ncr-sysv4.3 (running the X toolkit):
   _XipOpenIM() Unable to find Atom _XIM_INPUTMETHOD  */
 #define X11R5_INHIBIT_I18N
-
-/* arch-tag: 03ac8b3a-c3d4-4441-a773-1c1d9f111f1a
-   (do not change this comment) */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 719b8c389a3..49554b9456f 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -193,6 +193,3 @@ Boston, MA 02111-1307, USA.  */
    SINIX.  */
 #undef LIBS_SYSTEM
 #define LIBS_SYSTEM -lgen
-
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
-   (do not change this comment) */
diff --git a/src/s/ux4800.h b/src/s/ux4800.h
index 1c8729f416b..6544bfdebe3 100644
--- a/src/s/ux4800.h
+++ b/src/s/ux4800.h
@@ -15,6 +15,3 @@
 #ifndef __GNUC__
 #define C_DEBUG_SWITCH -O  -KOlimit=3000 -ZXNd=5000
 #endif
-
-/* arch-tag: e42eeb13-028a-490b-8427-0b57010f2ab9
-   (do not change this comment) */
diff --git a/src/s/uxpds.h b/src/s/uxpds.h
index c3ddf1039c1..0b823aaab0d 100644
--- a/src/s/uxpds.h
+++ b/src/s/uxpds.h
@@ -6,6 +6,3 @@
 #define XOS_NEEDS_TIME_H
 
 #define FSCALE 256
-
-/* arch-tag: c02db2a6-c725-4a6b-adee-66e0303df2a8
-   (do not change this comment) */
diff --git a/src/s/uxpv.h b/src/s/uxpv.h
index 95715455984..94ea91eb1a1 100644
--- a/src/s/uxpv.h
+++ b/src/s/uxpv.h
@@ -9,6 +9,3 @@
 
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "uxpv"
-
-/* arch-tag: 3f00cfe7-f44c-45ce-a2fe-2b17fc411a1e
-   (do not change this comment) */
diff --git a/src/s/vms.h b/src/s/vms.h
index dc7877eaa67..9f718099eef 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -246,6 +246,3 @@ globalref char sdata[];
 
 /* What separator do we use in paths?  */
 #define SEPCHAR ','
-
-/* arch-tag: 76bc2b70-46d1-4334-8f12-955c0d0ca6d4
-   (do not change this comment) */
diff --git a/src/s/vms4-0.h b/src/s/vms4-0.h
index c7e0c7be585..3f11a3de30a 100644
--- a/src/s/vms4-0.h
+++ b/src/s/vms4-0.h
@@ -1,5 +1,2 @@
 #include "vms.h"
 #define VMS4_0
-
-/* arch-tag: 734e1c69-d514-4441-bbcd-8b5db8ab1892
-   (do not change this comment) */
diff --git a/src/s/vms4-2.h b/src/s/vms4-2.h
index 01ee788dd66..e632b87e09f 100644
--- a/src/s/vms4-2.h
+++ b/src/s/vms4-2.h
@@ -1,5 +1,3 @@
 #include "vms.h"
 #define VMS4_2
 
-/* arch-tag: d9ff67bc-a899-44b2-a618-a73c821bb559
-   (do not change this comment) */
diff --git a/src/s/vms4-4.h b/src/s/vms4-4.h
index 0abd8259143..c0f60900d53 100644
--- a/src/s/vms4-4.h
+++ b/src/s/vms4-4.h
@@ -1,5 +1,3 @@
 #include "vms.h"
 #define VMS4_4
 
-/* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
-   (do not change this comment) */
diff --git a/src/s/vms5-5.h b/src/s/vms5-5.h
index ac0ba9461a2..e51fedf6317 100644
--- a/src/s/vms5-5.h
+++ b/src/s/vms5-5.h
@@ -6,6 +6,3 @@
    And defining it causes lossage because sys_errlist has a different
    number of elements.  */
 #undef SHARABLE_LIB_BUG
-
-/* arch-tag: 92acc416-61fe-44ae-b0e0-710cb9e38ec6
-   (do not change this comment) */
diff --git a/src/s/windows95.h b/src/s/windows95.h
index cf7f3f13c88..62340c3744e 100644
--- a/src/s/windows95.h
+++ b/src/s/windows95.h
@@ -3,6 +3,3 @@
 #include "windowsnt.h"
 
 #define WINDOWS95
-
-/* arch-tag: 8a37be6f-312c-4b2a-919e-58a71a0fb4b3
-   (do not change this comment) */
diff --git a/src/s/xenix.h b/src/s/xenix.h
index c0840bcd3b3..be742120b60 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -206,6 +206,3 @@ Boston, MA 02111-1307, USA.  */
    are not declared.  */
 
 #define BROKEN_TIOCGETC
-
-/* arch-tag: 71d3985d-4e53-4572-8276-5dce26bbd076
-   (do not change this comment) */