diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 02833ec0a828..772fd9f3414e 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -161,13 +161,13 @@ db_breakpoint_t
 db_find_breakpoint_here(addr)
 	db_addr_t	addr;
 {
-    return db_find_breakpoint(db_map_addr(addr), addr);
+	return db_find_breakpoint(db_map_addr(addr), addr);
 }
 
 static boolean_t	db_breakpoints_inserted = TRUE;
 
 #ifndef BKPT_WRITE
-#define BKPT_WRITE(addr, storage)				\
+#define	BKPT_WRITE(addr, storage)				\
 do {								\
 	*storage = db_get_value(addr, BKPT_SIZE, FALSE);	\
 	db_put_value(addr, BKPT_SIZE, BKPT_SET(*storage));	\
@@ -175,7 +175,7 @@ do {								\
 #endif
 
 #ifndef BKPT_CLEAR
-#define BKPT_CLEAR(addr, storage) \
+#define	BKPT_CLEAR(addr, storage) \
 	db_put_value(addr, BKPT_SIZE, *storage)
 #endif
 
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index e890a178a23a..dd9faef974d2 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -648,7 +648,7 @@ db_kill(dummy1, dummy2, dummy3, dummy4)
 	db_expr_t old_radix, pid, sig;
 	struct proc *p;
 
-#define DB_ERROR(f)	do { db_printf f; db_flush_lex(); goto out; } while (0)
+#define	DB_ERROR(f)	do { db_printf f; db_flush_lex(); goto out; } while (0)
 
 	/*
 	 * PIDs and signal numbers are typically represented in base
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index cbf9f0e3d68c..795719fce6e9 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -30,7 +30,7 @@
 #define	_DDB_DB_OUTPUT_H_
 
 /*
- * 	Author: David B. Golub, Carnegie Mellon University
+ *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	8/90
  */
 
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 6cffd6d8b63a..9e454565144d 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -25,7 +25,7 @@
  *
  */
 /*
- * 	Author: David B. Golub, Carnegie Mellon University
+ *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
 
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 81e141e6dade..d28a06099318 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -155,7 +155,7 @@ db_ps(db_expr_t addr, boolean_t hasaddr, db_expr_t count, char *modif)
 				else if (wflag)
 					state[0] = 'W';
 				else
-					state[0] = '?';				
+					state[0] = '?';
 			}
 			break;
 		case PRS_NEW:
@@ -211,7 +211,7 @@ db_ps(db_expr_t addr, boolean_t hasaddr, db_expr_t count, char *modif)
 		p = LIST_NEXT(p, p_list);
 		if (p == NULL && np > 0)
 			p = LIST_FIRST(&zombproc);
-    	}
+	}
 }
 
 static void
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 897dc3d57440..ce6704b39336 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -54,7 +54,7 @@ static int	db_run_mode;
 #define	STEP_RETURN	2
 #define	STEP_CALLT	3
 #define	STEP_CONTINUE	4
-#define STEP_INVISIBLE	5
+#define	STEP_INVISIBLE	5
 #define	STEP_COUNT	6
 
 static boolean_t	db_sstep_print;
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index e68be1fd5fec..1d9d462d693f 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -30,7 +30,7 @@
 #define	_DDB_DB_SYM_H_
 
 /*
- * 	Author: Alessandro Forin, Carnegie Mellon University
+ *	Author: Alessandro Forin, Carnegie Mellon University
  *	Date:	8/90
  */
 
diff --git a/sys/ddb/db_textdump.c b/sys/ddb/db_textdump.c
index e66487024040..b4b040b87509 100644
--- a/sys/ddb/db_textdump.c
+++ b/sys/ddb/db_textdump.c
@@ -348,8 +348,8 @@ textdump_dump_msgbuf(struct dumperinfo *di)
 	 */
 	total_len = 0;
 	offset = 0;
-        msgbuf_peekbytes(msgbufp, NULL, 0, &seq);
-        while ((len = msgbuf_peekbytes(msgbufp, buf, sizeof(buf), &seq)) > 0) {
+	msgbuf_peekbytes(msgbufp, NULL, 0, &seq);
+	while ((len = msgbuf_peekbytes(msgbufp, buf, sizeof(buf), &seq)) > 0) {
 		for (i = 0; i < len; i++) {
 			if (buf[i] == '\0')
 				continue;
@@ -362,7 +362,7 @@ textdump_dump_msgbuf(struct dumperinfo *di)
 			total_len += offset;
 			offset = 0;
 		}
-        }
+	}
 	total_len += offset;	/* Without the zero-padding. */
 	if (offset != 0) {
 		bzero(textdump_block_buffer + offset,
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 2866cd0488d6..1cbc481a1a7d 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * 	Author: David B. Golub, Carnegie Mellon University
+ *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
 
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index b2be970715ad..44ca191f72c4 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -303,8 +303,8 @@ db_deletehwatch_cmd(addr, have_addr, count, modif)
 {
 	int rc;
 
-        if (count < 0)
-                count = 4;
+	if (count < 0)
+		count = 4;
 
 	rc = db_md_clr_watchpoint(addr, count);
 	if (rc < 0)
@@ -322,8 +322,8 @@ db_hwatchpoint_cmd(addr, have_addr, count, modif)
 {
 	int rc;
 
-        if (count < 0)
-                count = 4;
+	if (count < 0)
+		count = 4;
 
 	rc = db_md_set_watchpoint(addr, count);
 	if (rc < 0)
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 7c48ce8af1b1..d4fdfc855bd4 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * 	Author: David B. Golub, Carnegie Mellon University
+ *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	10/90
  */