diff --git a/include/config.h b/include/config.h
index 1c728d459..8752feb39 100644
--- a/include/config.h
+++ b/include/config.h
@@ -266,7 +266,7 @@
 
 #ifdef CRASHREPORT
 # ifndef DUMPLOG_CORE
-#  define DUMPLOG_CORE	    // required to get ^P info
+#  define DUMPLOG_CORE     // required to get ^P info
 # endif
 # ifdef MACOS
 #  define PANICTRACE
diff --git a/src/date.c b/src/date.c
index aef985e75..f4b96fdb0 100644
--- a/src/date.c
+++ b/src/date.c
@@ -29,7 +29,7 @@ struct nomakedefs_s nomakedefs = {
     "Version 1.0, built Jul 28 13:18:57 1987.",
     (const char *) 0,   /* git_sha */
     (const char *) 0,   /* git_branch */
-    (const char *) 0,	/* git_prefix */
+    (const char *) 0,   /* git_prefix */
     "1.0.0-0",
     "NetHack Version 1.0.0-0 - last build Tue Jul 28 13:18:57 1987.",
     0x01010000UL,
diff --git a/src/options.c b/src/options.c
index e9da50d52..84d1f7d70 100644
--- a/src/options.c
+++ b/src/options.c
@@ -6951,7 +6951,7 @@ initoptions_init(void)
     int i;
     boolean have_branch = (nomakedefs.git_branch && *nomakedefs.git_branch);
 
-    go.opt_phase = builtin_opt;		// Did I need to move this here?
+    go.opt_phase = builtin_opt;    /* Did I need to move this here? */
     memcpy(allopt, allopt_init, sizeof(allopt));
     determine_ambiguities();
 
diff --git a/src/report.c b/src/report.c
index 890b3fdca..5be3e93dd 100644
--- a/src/report.c
+++ b/src/report.c
@@ -220,7 +220,7 @@ crashreport_bidshow(void)
     mark = uend;                                \
     if (utmp >= urem)                           \
         goto full;                              \
-    memcpy(uend, str, utmp);			\
+    memcpy(uend, str, utmp);                    \
     uend += utmp; urem -= utmp;                 \
     *uend = '\0';
 
diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c
index d43cdc362..81ae866cb 100644
--- a/sys/libnh/libnhmain.c
+++ b/sys/libnh/libnhmain.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	libnhmain.c	$NHDT-Date: 1693359589 2023/08/30 01:39:49 $  $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.106 $ */
+/* NetHack 3.7  libnhmain.c $NHDT-Date: 1693359589 2023/08/30 01:39:49 $  $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.106 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -103,8 +103,8 @@ nhmain(int argc, char *argv[])
             exit(EXIT_SUCCESS);
 
 #ifdef CRASHREPORT
-	if (argcheck(argc, argv, ARG_BIDSHOW))
-	    exit(EXIT_SUCCESS);
+        if (argcheck(argc, argv, ARG_BIDSHOW))
+            exit(EXIT_SUCCESS);
 #endif
 
         if (argcheck(argc, argv, ARG_SHOWPATHS) == 2) {
diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index 679f5e627..2da734fd0 100644
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -644,15 +644,15 @@ early_options(int *argc_p, char ***argv_p, char **hackdir_p)
             ++arg;
 
         switch (arg[1]) { /* char after leading dash */
-	case 'b':
+        case 'b':
 #ifdef CRASHREPORT
-		// --bidshow
-	    if (argcheck(argc, argv, ARG_BIDSHOW) == 2){
+            // --bidshow
+            if (argcheck(argc, argv, ARG_BIDSHOW) == 2){
                 opt_terminate();
                 /*NOTREACHED*/
-	    }
+            }
 #endif
-	    break;
+            break;
         case 'd':
             if (argcheck(argc, argv, ARG_DEBUG) == 1) {
                 consume_arg(ndx, argc_p, argv_p), consumed = 1;
diff --git a/sys/windows/consoletty.c b/sys/windows/consoletty.c
index d1cbfbbca..5f624bec8 100644
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -300,7 +300,7 @@ static INPUT_RECORD bogus_key;
 /*
 Windows console palette:
 Color Name      Console Legacy RGB Values  New Default RGB Values
-BLACK           0,0,0	                   12,12,12
+BLACK           0,0,0                      12,12,12
 DARK_BLUE       0,0,128                    0,55,218
 DARK_GREEN      0,128,0                    19,161,14
 DARK_CYAN       0,128,128                  58,150,221
diff --git a/sys/windows/win10.h b/sys/windows/win10.h
index 22a4c0f12..cc8a0bf48 100644
--- a/sys/windows/win10.h
+++ b/sys/windows/win10.h
@@ -1,5 +1,5 @@
 /* NetHack 3.7	win10.h	$NHDT-Date: 1596498319 2020/08/03 23:45:19 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.8 $ */
-/* Copyright (C) 2018 by Bart House 	 */
+/* Copyright (C) 2018 by Bart House */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #ifndef WIN10_H