diff --git a/headers/os/drivers/KernelExport.h b/headers/os/drivers/KernelExport.h
index c9dcd4e320..73578b697c 100644
--- a/headers/os/drivers/KernelExport.h
+++ b/headers/os/drivers/KernelExport.h
@@ -138,8 +138,8 @@ typedef void (*daemon_hook)(void *arg, int iteration);
 /* kernel debugging facilities */
 
 /* special return codes for kernel debugger */
-#define  B_KDEBUG_CONT   2
-#define  B_KDEBUG_QUIT   3
+#define B_KDEBUG_CONT	2
+#define B_KDEBUG_QUIT	3
 
 typedef int (*debugger_command_hook)(int argc, char **argv);
 
@@ -207,7 +207,7 @@ extern void			dprintf(const char *format, ...) _PRINTFLIKE(1, 2);
 extern void			dvprintf(const char *format, va_list args);
 extern void			kprintf(const char *fmt, ...) _PRINTFLIKE(1, 2);
 
-extern void 		dump_block(const char *buffer, int size, const char *prefix);
+extern void			dump_block(const char *buffer, int size, const char *prefix);
 						/* TODO: temporary API: hexdumps given buffer */
 
 extern bool			set_dprintf_enabled(bool new_state);
diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp
index 768186019d..af3d9c6d1c 100644
--- a/src/system/boot/loader/menu.cpp
+++ b/src/system/boot/loader/menu.cpp
@@ -553,7 +553,7 @@ public:
 			&& menu->Superitem() != NULL) {
 			return static_cast<BlocklistMenuItem*>(menu->Superitem())
 					->GetPath(_path)
-			   && _path.Append(Label());
+				&& _path.Append(Label());
 		}
 
 		return _path.SetTo(Label());
@@ -1301,13 +1301,13 @@ add_safe_mode_menu()
 	safeMenu->AddItem(item = new(nothrow) MenuItem("Disable user add-ons"));
 	item->SetData(B_SAFEMODE_DISABLE_USER_ADD_ONS);
 	item->SetType(MENU_ITEM_MARKABLE);
-    item->SetHelpText("Prevents all user installed add-ons from being loaded. "
+	item->SetHelpText("Prevents all user installed add-ons from being loaded. "
 		"Only the add-ons in the system directory will be used.");
 
 	safeMenu->AddItem(item = new(nothrow) MenuItem("Disable IDE DMA"));
 	item->SetData(B_SAFEMODE_DISABLE_IDE_DMA);
 	item->SetType(MENU_ITEM_MARKABLE);
-    item->SetHelpText("Disables IDE DMA, increasing IDE compatibility "
+	item->SetHelpText("Disables IDE DMA, increasing IDE compatibility "
 		"at the expense of performance.");
 
 #if B_HAIKU_PHYSICAL_BITS > 32
@@ -1453,8 +1453,8 @@ add_debug_menu()
 	item->SetType(MENU_ITEM_MARKABLE);
 	item->SetMarked(gKernelArgs.keep_debug_output_buffer);
 	item->SetTarget(&debug_menu_toggle_debug_syslog);
-    item->SetHelpText("Enables a special in-memory syslog buffer for this "
-    	"session that the boot loader will be able to access after rebooting.");
+	item->SetHelpText("Enables a special in-memory syslog buffer for this "
+		"session that the boot loader will be able to access after rebooting.");
 
 	ring_buffer* syslogBuffer
 		= (ring_buffer*)gKernelArgs.debug_output.Pointer();