diff --git a/include/integer.h b/include/integer.h
index 479ccc9bd..64d597030 100644
--- a/include/integer.h
+++ b/include/integer.h
@@ -50,7 +50,7 @@
 #endif  /* !HAS_INTTYPES_H */
 #if defined(__GNUC__) && defined(__INT64_MAX__) && !defined(HAS_STDINT_H)
 #define HAS_STDINT_H
-#endif 
+#endif
 #endif  /* claims to be C99 */
 
 #endif /*?__DECC*/
diff --git a/include/revision.h b/include/revision.h
index efb21bb30..70c0dd6fe 100644
--- a/include/revision.h
+++ b/include/revision.h
@@ -171,7 +171,7 @@
  *       extern void uplift_mystruct_rev0_to_mystruct(struct mystruct_rev0 *,
  *                                                    struct mystruct *);
  *
- * 17. Add the uplift function to src/revision.c.  It needs to do 
+ * 17. Add the uplift function to src/revision.c.  It needs to do
  *     field-by-field copies of the fields that exist in the old
  *     revision and the new revision. For now, it likely needs to
  *     be handcrafted using your knowledge of the struct's old
diff --git a/include/unixconf.h b/include/unixconf.h
index 0bae0ddf0..ffe5d7a03 100644
--- a/include/unixconf.h
+++ b/include/unixconf.h
@@ -332,15 +332,15 @@
 #endif
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-#define tparm2(s, x)	tparm(s,x,0,0,0,0,0,0,0,0)
+#define tparm2(s, x) tparm(s,x,0,0,0,0,0,0,0,0)
 #else
-#define tparm2(s, x)	tparm(s,x)
+#define tparm2(s, x) tparm(s,x)
 #endif
 
 #if defined(BSD) || defined(ULTRIX)
 #if !defined(DGUX) && !defined(SUNOS4) \
-	&& !defined(__NetBSD__) && !defined(__FreeBSD__) \
-	&& !defined(__OpenBSD__)
+    && !defined(__NetBSD__) && !defined(__FreeBSD__) \
+    && !defined(__OpenBSD__)
 #define memcpy(d, s, n) bcopy(s, d, n)
 #define memcmp(s1, s2, n) bcmp(s2, s1, n)
 #endif
diff --git a/src/dothrow.c b/src/dothrow.c
index 45a0e00cf..4d61959eb 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -1757,11 +1757,11 @@ throwit(
                     }
                     if (!dmg) {
                         if (tethered_weapon) {
-				  /* Blind mods unnecessary; you know what you threw,
-				   * and it is tethered to your arm */
-                                  pline("Your tethered %s snaps back but the tether slips from your %s.",
-                                        simpleonames(obj), body_part(ARM));
-				  tether_released_msg = TRUE;
+                            /* Blind mods unnecessary; you know what you threw,
+                             * and it is tethered to your arm */
+                            pline("Your tethered %s snaps back but the tether slips from your %s.",
+                                  simpleonames(obj), body_part(ARM));
+                            tether_released_msg = TRUE;
                         } else {
                             pline(Blind
                                       ? "%s lands %s your %s."
diff --git a/src/hacklib.c b/src/hacklib.c
index 103443c0d..35757e4ed 100644
--- a/src/hacklib.c
+++ b/src/hacklib.c
@@ -974,7 +974,7 @@ static struct datamodel_information dm[] = {
       "", "" },
     { { 2, 4, 4, 8, 4 }, "ILP32LL64", "x86 32-bit" }, /* Windows or Unix */
     { { 2, 4, 4, 8, 8 }, "IL32LLP64", "Windows x64 64-bit" },
-    { { 2, 4, 8, 8, 8 }, "I32LP64", "Unix 64-bit"}, 
+    { { 2, 4, 8, 8, 8 }, "I32LP64", "Unix 64-bit"},
     { { 2, 8, 8, 8, 8 }, "ILP64", "Unix ILP64"},      /* HAL, SPARC64 */
 };
 
diff --git a/src/options.c b/src/options.c
index bfcef4576..e9c576399 100644
--- a/src/options.c
+++ b/src/options.c
@@ -5314,7 +5314,7 @@ optfn_boolean(
 #ifndef IDLECHECKPOINT
         case opt_idlecheckpoint:
             pline("There is no underlying support for 'idlecheckpoint'"
-                  " compiled in."); 
+                  " compiled in.");
             iflags.idlecheckpoint = FALSE;
             give_opt_msg = FALSE;
             break;
@@ -7430,7 +7430,7 @@ allopt_array_init(void)
                 if (allopt[i].opttyp == BoolOpt && i != opt_ascii_map)
                     allopt[i].initval = allopt[i].opt_in_out;
 #endif
-		*(allopt[i].addr) = allopt[i].initval;
+                *(allopt[i].addr) = allopt[i].initval;
             }
         }
         heed_all_options();
diff --git a/src/sfbase.c b/src/sfbase.c
index b26175b99..b78cd3167 100644
--- a/src/sfbase.c
+++ b/src/sfbase.c
@@ -106,7 +106,7 @@ void sf_log(NHFILE *, const char *, size_t, int, char *);
 #define Sfvalue_xint16(a) sfvalue(a)
 #endif
 
-/* not in _Generic */ 
+/* not in _Generic */
 #define Sfvalue_long(a) sfvalue_long(a)
 #define Sfvalue_ulong(a) sfvalue_ulong(a)
 #define Sfvalue_char(a, d) sfvalue_char(a, d)
@@ -195,7 +195,7 @@ void sfi_##dtyp(NHFILE *nhfp, keyw dtyp *d_##dtyp, const char *myname)
                        complex_dump((uchar *) d_##dtyp));                       \
     }                                                                           \
 }
-  
+
 #define SF_X(xxx, dtyp) \
 void sfo_##dtyp(NHFILE *nhfp, xxx *d_##dtyp, const char *myname, int bfsz)      \
 {                                                                               \
@@ -461,7 +461,7 @@ sfvalue_genericptr(genericptr a)
 {
     static char buf[20];
 
-    Snprintf(buf, sizeof buf, "%s", 
+    Snprintf(buf, sizeof buf, "%s",
              (a == 0) ? "0" : "glorkum");
     return buf;
 }
@@ -632,7 +632,8 @@ complex_dump(uchar *a)
     for (i = 0; i < SIZE(x); ++i) {
         x[i] = *uc++;
     }
-    Snprintf(buf, sizeof buf, "%03x %03x %03x %03x %03x %03x %03x %03x %03x %03x", 
+    Snprintf(buf, sizeof buf,
+             "%03x %03x %03x %03x %03x %03x %03x %03x %03x %03x",
              x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9]);
     buf[40] = '\0';
     return buf;