diff --git a/src/foreign/gcc/libffi/src/closures.c b/src/foreign/gcc/libffi/src/closures.c
index d1987510d7..0e8f2d11b4 100644
--- a/src/foreign/gcc/libffi/src/closures.c
+++ b/src/foreign/gcc/libffi/src/closures.c
@@ -379,12 +379,12 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
 	  close (execfd);
 	  goto retry_open;
 	}
-	  if (ftruncate (execfd, offset)) {
-		// FIXME: Should fail "even worse" because the truncate failed
-		return MFAIL;
+      if (ftruncate (execfd, offset)) {
+	// FIXME: Should fail "even worse" because the truncate failed
+	return MFAIL;
       } else {
-	    return MFAIL;
-	  } 
+	return MFAIL;
+      }
     }
   else if (!offset
 	   && open_temp_exec_file_opts[open_temp_exec_file_opts_idx].repeat)
@@ -395,11 +395,11 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
   if (start == MFAIL)
     {
       munmap (ptr, length);
-	  if (ftruncate (execfd, offset)) {
-	   // FIXME: Should return failure, but how to recover work we've done?
-		  1;
-	  }
-	  return start;
+      if (ftruncate (execfd, offset)) {
+        // FIXME: Should return failure, but how to recover work we've done?
+        1;
+      }
+      return start;
     }
 
   mmap_exec_offset ((char *)start, length) = (char*)ptr - (char*)start;
diff --git a/src/racket/gc/alloc.c b/src/racket/gc/alloc.c
index 3d0169b038..16b20e2102 100644
--- a/src/racket/gc/alloc.c
+++ b/src/racket/gc/alloc.c
@@ -335,7 +335,7 @@ GC_collect_end_callback_Proc GC_set_collect_end_callback(GC_collect_end_callback
 GC_bool GC_try_to_collect_inner(GC_stop_func stop_func)
 {
     CLOCK_TYPE start_time = CLOCK_ZERO;
-	CLOCK_TYPE current_time;
+    CLOCK_TYPE current_time;
     if (GC_dont_gc) return FALSE;
     /* PLTSCHEME */
     if (GC_collect_start_callback)
@@ -483,10 +483,10 @@ GC_bool GC_stopped_mark(GC_stop_func stop_func)
     unsigned i;
     int dummy;
     CLOCK_TYPE start_time = CLOCK_ZERO;
-	CLOCK_TYPE current_time;
-	
+    CLOCK_TYPE current_time;
+
     if (GC_print_stats)
-	GET_TIME(start_time);
+      GET_TIME(start_time);
 
 #   if !defined(REDIRECT_MALLOC) && (defined(MSWIN32) || defined(MSWINCE))
         GC_add_current_malloc_heap();
diff --git a/src/racket/gc/mark.c b/src/racket/gc/mark.c
index 5ab35b66bc..c53a307bd6 100644
--- a/src/racket/gc/mark.c
+++ b/src/racket/gc/mark.c
@@ -617,11 +617,11 @@ void GC_mark_overflow_recover(void *p)
  */
 mse * GC_mark_from(mse *mark_stack_top, mse *mark_stack, mse *mark_stack_limit)
 {
-  signed_word credit = HBLKSIZE;  /* Remaining credit for marking work	*/
-  ptr_t current_p;	/* Pointer to current candidate ptr.	*/
-  word current;	/* Candidate pointer.			*/
-  ptr_t limit = NULL;	/* (Incl) limit of current candidate 	*/
-						/* range				*/
+  signed_word credit = HBLKSIZE;  /* Remaining credit for marking work */
+  ptr_t current_p;      /* Pointer to current candidate ptr. */
+  word current;         /* Candidate pointer.                */
+  ptr_t limit = NULL;   /* (Incl) limit of current candidate */
+                        /* range                             */
   word descr;
   ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
   ptr_t least_ha = GC_least_plausible_heap_addr;
diff --git a/src/racket/gc/mark_rts.c b/src/racket/gc/mark_rts.c
index ef60d8074f..f426799c1b 100644
--- a/src/racket/gc/mark_rts.c
+++ b/src/racket/gc/mark_rts.c
@@ -369,7 +369,7 @@ ptr_t GC_approx_sp(void)
 #   ifdef _MSC_VER
 #     pragma warning(disable:4172)
 #   endif
-	ptr_t addr = ((ptr_t)(&dummy));
+    ptr_t addr = ((ptr_t)(&dummy));
     return addr;
 #   ifdef _MSC_VER
 #     pragma warning(default:4172)
diff --git a/src/racket/gc/new_hblk.c b/src/racket/gc/new_hblk.c
index 9d6810e45c..dd18855032 100644
--- a/src/racket/gc/new_hblk.c
+++ b/src/racket/gc/new_hblk.c
@@ -118,55 +118,55 @@ ptr_t GC_build_fl(struct hblk *h, size_t sz, GC_bool clear, ptr_t list)
   /* If we were more serious about it, these should go inside	*/
   /* the loops.  But write prefetches usually don't seem to	*/
   /* matter much.						*/
-    PREFETCH_FOR_WRITE((ptr_t)h);
-    PREFETCH_FOR_WRITE((ptr_t)h + 128);
-    PREFETCH_FOR_WRITE((ptr_t)h + 256);
-    PREFETCH_FOR_WRITE((ptr_t)h + 378);
+  PREFETCH_FOR_WRITE((ptr_t)h);
+  PREFETCH_FOR_WRITE((ptr_t)h + 128);
+  PREFETCH_FOR_WRITE((ptr_t)h + 256);
+  PREFETCH_FOR_WRITE((ptr_t)h + 378);
   /* Handle small objects sizes more efficiently.  For larger objects 	*/
   /* the difference is less significant.				*/
 #  ifndef SMALL_CONFIG
-    switch (sz) {
-        case 2: if (clear) {
-        	    return GC_build_fl_clear2(h, list);
-        	} else {
-        	    return GC_build_fl2(h, list);
-        	}
-        case 4: if (clear) {
-        	    return GC_build_fl_clear4(h, list);
-        	} else {
-        	    return GC_build_fl4(h, list);
-        	}
-        default:
-        	break;
+  switch (sz) {
+  case 2: if (clear) {
+      return GC_build_fl_clear2(h, list);
+    } else {
+      return GC_build_fl2(h, list);
     }
+  case 4: if (clear) {
+      return GC_build_fl_clear4(h, list);
+    } else {
+      return GC_build_fl4(h, list);
+    }
+  default:
+    break;
+  }
 #  endif /* !SMALL_CONFIG */
-    
+
   /* Clear the page if necessary. */
-    if (clear) BZERO(h, HBLKSIZE);
-    
+  if (clear) BZERO(h, HBLKSIZE);
+
   /* Add objects to free list */
-    p = (word *)(h -> hb_body) + sz;	/* second object in *h	*/
-    prev = (word *)(h -> hb_body);       	/* One object behind p	*/
-    last_object = (word *)((char *)h + HBLKSIZE);
-    last_object -= sz;
-			    /* Last place for last object to start */
+  p = (word *)(h -> hb_body) + sz;  /* second object in *h */
+  prev = (word *)(h -> hb_body);    /* One object behind p */
+  last_object = (word *)((char *)h + HBLKSIZE);
+  last_object -= sz;
+                     /* Last place for last object to start */
 
   /* make a list of all objects in *h with head as last object */
-    while (p <= last_object) {
-      /* current object's link points to last object */
-        obj_link(p) = (ptr_t)prev;
-	prev = p;
-	p += sz;
-    }
-    p -= sz;			/* p now points to last object */
+  while (p <= last_object) {
+    /* current object's link points to last object */
+    obj_link(p) = (ptr_t)prev;
+    prev = p;
+    p += sz;
+  }
+  p -= sz;			/* p now points to last object */
 
   /*
    * put p (which is now head of list of objects in *h) as first
    * pointer in the appropriate free list for this size.
    */
-	  word *tmp = (word *)h->hb_body;
-      obj_link(tmp) = list;
-      return ((ptr_t)p);
+  word *tmp = (word *)h->hb_body;
+  obj_link(tmp) = list;
+  return ((ptr_t)p);
 }
 
 
diff --git a/src/racket/gc/os_dep.c b/src/racket/gc/os_dep.c
index 48f28569f4..4e647a287b 100644
--- a/src/racket/gc/os_dep.c
+++ b/src/racket/gc/os_dep.c
@@ -1217,7 +1217,7 @@ ptr_t GC_get_main_stack_base(void)
 #   if defined(HEURISTIC1) || defined(HEURISTIC2)
       MAYBE_UNUSED word dummy;
 #   endif
-	MAYBE_UNUSED ptr_t result;
+      MAYBE_UNUSED ptr_t result;
 
 #   define STACKBOTTOM_ALIGNMENT_M1 ((word)STACK_GRAN - 1)
 
diff --git a/src/racket/gc/pthread_stop_world.c b/src/racket/gc/pthread_stop_world.c
index 2b8d644334..62241e6da3 100644
--- a/src/racket/gc/pthread_stop_world.c
+++ b/src/racket/gc/pthread_stop_world.c
@@ -223,7 +223,7 @@ void GC_suspend_handler_inner(ptr_t sig_arg, void *context)
 void GC_restart_handler(int sig)
 {
     MAYBE_UNUSED pthread_t my_thread = pthread_self();
-	MAYBE_UNUSED GC_thread me;
+    MAYBE_UNUSED GC_thread me;
 
     if (sig != SIG_THR_RESTART) ABORT("Bad signal in suspend_handler");
 
diff --git a/src/utils/nicear b/src/utils/nicear
index fd62028ab8..f1b10df090 100755
--- a/src/utils/nicear
+++ b/src/utils/nicear
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 $* 2>&1 | awk '/^ar: creating / || /^[ar] \-/ { print } ! ( /ar: creating / || /^[ar] \-/ ) { print | "cat 1>&2" }'
-
diff --git a/src/wxxt/contrib/xpm/lib/data.c b/src/wxxt/contrib/xpm/lib/data.c
index 3957f35e97..699f6f98d1 100644
--- a/src/wxxt/contrib/xpm/lib/data.c
+++ b/src/wxxt/contrib/xpm/lib/data.c
@@ -385,13 +385,13 @@ xpmGetCmt(mdata, cmt)
 
 xpmDataType xpmDataTypes[] =
 {
-    {"", "!", "\n", '\0', '\n', "", "", "", ""},	/* Natural type */
-	{"C", "/*", "*/", '"', '"', ",\n", "static char *", "[] = {\n", "};\n"},
-	{"Lisp", ";", "\n", '"', '"', "\n", "(setq ", " '(\n", "))\n"},
+  {"", "!", "\n", '\0', '\n', "", "", "", ""},  /* Natural type */
+  {"C", "/*", "*/", '"', '"', ",\n", "static char *", "[] = {\n", "};\n"},
+  {"Lisp", ";", "\n", '"', '"', "\n", "(setq ", " '(\n", "))\n"},
 #ifdef VMS
-    NULL
+  NULL
 #else
-    {NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL}
+  {NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL}
 #endif
 };
 
diff --git a/src/wxxt/contrib/xpm/lib/parse.c b/src/wxxt/contrib/xpm/lib/parse.c
index 69ae6be624..232f2b7604 100644
--- a/src/wxxt/contrib/xpm/lib/parse.c
+++ b/src/wxxt/contrib/xpm/lib/parse.c
@@ -190,7 +190,7 @@ xpmParseData(data, image, info)
 	    info->extensions = NULL;
 	    info->nextensions = 0;
 	}
-	}
+    }
 
     /*
      * store found informations in the XpmImage structure
@@ -335,7 +335,7 @@ ParseColors(data, ncolors, cpp, colorTablePtr, hashtable)
     XpmColor **colorTablePtr;
     xpmHashTable *hashtable;
 {
-	uintptr_t a;
+    uintptr_t a;
     unsigned int key, l, b;
     unsigned int curkey;		/* current color key */
     unsigned int lastwaskey;		/* key read */
diff --git a/src/wxxt/contrib/xpm/lib/scan.c b/src/wxxt/contrib/xpm/lib/scan.c
index 2b3dc8c8ae..3123ea59a3 100644
--- a/src/wxxt/contrib/xpm/lib/scan.c
+++ b/src/wxxt/contrib/xpm/lib/scan.c
@@ -396,7 +396,7 @@ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
     XColor *xcolors = NULL, *xcolor;
     char *colorname, *s;
     XpmColor *colorTable = NULL;
-	XpmColor **oldColorTable = NULL;
+    XpmColor **oldColorTable = NULL;
     unsigned int ancolors = 0;
     Pixel *apixels = NULL;
     unsigned int mask_pixel = 0;
diff --git a/src/wxxt/src/Windows/ListBox.cc b/src/wxxt/src/Windows/ListBox.cc
index c07aef2889..b4521e3808 100644
--- a/src/wxxt/src/Windows/ListBox.cc
+++ b/src/wxxt/src/Windows/ListBox.cc
@@ -498,19 +498,19 @@ Bool wxListBox::Selected(int n)
 
 void wxListBox::SetClientData(int n, char *_client_data)
 {
-    if (0 <= n && n < num_choices)
-	client_data[n] = _client_data;
+  if (0 <= n && n < num_choices)
+    client_data[n] = _client_data;
 }
 
 void wxListBox::SetSelection(int n, Bool select)
 {
-	if (0 <= n && n < num_choices) {
-		if (select) {
-			XfwfMultiListHighlightItem(MULTILIST, n);
-		} else {
-			XfwfMultiListUnhighlightItem(MULTILIST, n);
-		}
-	}
+  if (0 <= n && n < num_choices) {
+    if (select) {
+      XfwfMultiListHighlightItem(MULTILIST, n);
+    } else {
+      XfwfMultiListUnhighlightItem(MULTILIST, n);
+    }
+  }
 }
 
 void wxListBox::SetOneSelection(int n)
@@ -524,12 +524,12 @@ void wxListBox::SetOneSelection(int n)
 
 Bool wxListBox::SetStringSelection(char *s)
 {
-    int n;
-    if ((n = FindString(s)) > -1) {
-	SetOneSelection(n);
-	return TRUE;
-    }
-    return FALSE;
+  int n;
+  if ((n = FindString(s)) > -1) {
+    SetOneSelection(n);
+    return TRUE;
+  }
+  return FALSE;
 }
 
 void wxListBox::SetString(int n, char *s)
@@ -537,7 +537,7 @@ void wxListBox::SetString(int n, char *s)
   if (0 <= n && n < num_choices) {
     s = copystring(s);
     choices[n] = s;
-    SetInternalData();    
+    SetInternalData();
   }
 }