diff --git a/src/game_ui.h b/src/game_ui.h
index 17e6d981..fb4a9f19 100644
--- a/src/game_ui.h
+++ b/src/game_ui.h
@@ -1,5 +1,5 @@
-#ifndef _UNKNOWN_09F8F0_H_
-#define _UNKNOWN_09F8F0_H_
+#ifndef _GAME_UI_H_
+#define _GAME_UI_H_
 
 #include "types.h"
 #include "structs.h"
diff --git a/src/object_functions.h b/src/object_functions.h
index c2f9f1a4..6ae9b157 100644
--- a/src/object_functions.h
+++ b/src/object_functions.h
@@ -1,5 +1,5 @@
-#ifndef _UNKNOWN_0348C0_H_
-#define _UNKNOWN_0348C0_H_
+#ifndef _OBJECT_FUNCTIONS_H_
+#define _OBJECT_FUNCTIONS_H_
 
 #include "types.h"
 #include "structs.h"
diff --git a/src/racer.h b/src/racer.h
index 892d9eb6..81c1ca89 100644
--- a/src/racer.h
+++ b/src/racer.h
@@ -1,5 +1,5 @@
-#ifndef _UNKNOWN_043920_H_
-#define _UNKNOWN_043920_H_
+#ifndef _RACER_H_
+#define _RACER_H_
 
 #include "types.h"
 #include "structs.h"
diff --git a/src/save_data.h b/src/save_data.h
index 57df0d82..7db53ac0 100644
--- a/src/save_data.h
+++ b/src/save_data.h
@@ -1,5 +1,5 @@
-#ifndef _CONTROLLER_PAK_H_
-#define _CONTROLLER_PAK_H_
+#ifndef _SAVE_DATA_H_
+#define _SAVE_DATA_H_
 
 #include "types.h"
 #include "structs.h"
diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c
index 9499a56c..76c7f3a8 100644
--- a/src/unknown_00BC20.c
+++ b/src/unknown_00BC20.c
@@ -1770,7 +1770,7 @@ void run_object_init_func(Object *obj, void *entry) {
     }
 }
 
-s32 func_80023E30(s32 arg0){
+s32 func_80023E30(s32 arg0) {
   s32 value = 0;
   switch (arg0 - 1){
     case 0x00: