diff --git a/lib/eventlog/eventlog.c b/lib/eventlog/eventlog.c
index 07280707b..22ae38a8f 100644
--- a/lib/eventlog/eventlog.c
+++ b/lib/eventlog/eventlog.c
@@ -406,7 +406,7 @@ send_mail(const struct eventlog *evlog, const char *message)
 			strerror(errno));
 		    sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
 		    _exit(EXIT_FAILURE);
-	    	/* NOTREACHED */
+		    /* NOTREACHED */
 		case 0:
 		    /* Grandchild continues below. */
 		    sudo_debug_enter(__func__, __FILE__, __LINE__, sudo_debug_subsys);
@@ -414,7 +414,7 @@ send_mail(const struct eventlog *evlog, const char *message)
 		default:
 		    /* Parent will wait for us. */
 		    _exit(EXIT_SUCCESS);
-	    	/* NOTREACHED */
+		    /* NOTREACHED */
 	    }
 	    break;
 	default:
diff --git a/lib/eventlog/regress/eventlog_store/store_json_test.c b/lib/eventlog/regress/eventlog_store/store_json_test.c
index d237cb483..43be33522 100644
--- a/lib/eventlog/regress/eventlog_store/store_json_test.c
+++ b/lib/eventlog/regress/eventlog_store/store_json_test.c
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
 		break;
 	    default:
 		usage();
-	    /* NOTREACHED */
+		/* NOTREACHED */
 	}
     }
     argc -= optind;
diff --git a/lib/eventlog/regress/eventlog_store/store_sudo_test.c b/lib/eventlog/regress/eventlog_store/store_sudo_test.c
index 2e024db76..6b73a2f15 100644
--- a/lib/eventlog/regress/eventlog_store/store_sudo_test.c
+++ b/lib/eventlog/regress/eventlog_store/store_sudo_test.c
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
 		break;
 	    default:
 		usage();
-	    /* NOTREACHED */
+		/* NOTREACHED */
 	}
     }
     argc -= optind;
diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index aed5d0ae5..3612bb45a 100644
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -201,7 +201,7 @@ main(int argc, char *argv[])
 		break;
 	    default:
 		usage();
-	    /* NOTREACHED */
+		/* NOTREACHED */
 	}
     }
     argc -= optind;
diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index f25bf35db..794e0033c 100644
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -197,7 +197,7 @@ main(int argc, char *argv[])
 		break;
 	    case 'h':
 		help();
-	    /* NOTREACHED */
+		/* NOTREACHED */
 	    case 'I':
 		edit_includes = false;
 		break;
diff --git a/src/exec_monitor.c b/src/exec_monitor.c
index 49ab6369c..79abdff11 100644
--- a/src/exec_monitor.c
+++ b/src/exec_monitor.c
@@ -703,7 +703,7 @@ exec_monitor(struct command_details *details, sigset_t *oset,
 #endif
     sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, 1);
     _exit(EXIT_FAILURE);
-	/* NOTREACHED */
+    /* NOTREACHED */
 
 bad:
     debug_return_int(-1);
diff --git a/src/sudo.c b/src/sudo.c
index 168134df3..bd2b2c2c2 100644
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -1168,7 +1168,7 @@ policy_open(void)
 
     if (ok != 1) {
 	    if (ok == -2)
-	    usage();
+		usage();
 	    /* XXX - audit */
 	    sudo_fatalx("%s", U_("unable to initialize policy plugin"));
     }