z64 - a

include/actor.h

@@ -1,10 +1,10 @@
-#ifndef Z64ACTOR_H
-#define Z64ACTOR_H
+#ifndef ACTOR_H
+#define ACTOR_H
 
 #include "color.h"
 #include "romfile.h"
-#include "z64actor_profile.h"
-#include "z64animation.h"
+#include "actor_profile.h"
+#include "animation.h"
 #include "z64math.h"
 #include "z64collision_check.h"
 

include/actor_profile.h

@@ -1,5 +1,5 @@
-#ifndef Z64ACTOR_PROFILE_H
-#define Z64ACTOR_PROFILE_H
+#ifndef ACTOR_PROFILE_H
+#define ACTOR_PROFILE_H
 
 #include "ultra64.h"
 

include/animation.h

@@ -1,5 +1,5 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"

include/animation_legacy.h

@@ -1,5 +1,5 @@
-#ifndef Z64_ANIMATION_LEGACY_H
-#define Z64_ANIMATION_LEGACY_H
+#ifndef ANIMATION_LEGACY_H
+#define ANIMATION_LEGACY_H
 
 #include "ultra64.h"
 #include "z64math.h"

include/audio.h

@@ -1,5 +1,5 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "ultra64.h"
 #include "sequence.h"

include/audio/soundfont_file.h

@@ -4,7 +4,7 @@
 #include "libc/stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Envelope definitions
 

include/audiomgr.h

@@ -2,7 +2,7 @@
 #define AUDIOMGR_H
 
 #include "sched.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef enum AudioMgrDebugLevel {
     /* 0 */ AUDIOMGR_DEBUG_LEVEL_NONE,

include/z64.h

@@ -10,8 +10,8 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z64play.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
+#include "animation.h"
+#include "animation_legacy.h"
 #include "z64curve.h"
 #include "z64skin.h"
 #include "z64player.h"

include/z64pause.h

@@ -1,7 +1,7 @@
 #ifndef Z64PAUSE_H
 #define Z64PAUSE_H
 
-#include "z64animation.h"
+#include "animation.h"
 #include "z64message.h"
 #include "z64view.h"
 

include/z64play.h

@@ -5,7 +5,7 @@
 
 #include "prerender.h"
 #include "transition_tile.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64bgcheck.h"
 #include "z64camera.h"
 #include "z64cutscene.h"

include/z64player.h

@@ -1,7 +1,7 @@
 #ifndef Z64PLAYER_H
 #define Z64PLAYER_H
 
-#include "z64actor.h"
+#include "actor.h"
 #include "alignment.h"
 #include "face_change.h"
 

include/z64skin.h

@@ -1,7 +1,7 @@
 #ifndef Z64_SKIN_H
 #define Z64_SKIN_H
 
-#include "z64animation.h"
+#include "animation.h"
 
 struct Actor;
 struct GraphicsContext;

include/z_actor_dlftbls.h

@@ -2,7 +2,7 @@
 #define Z_ACTOR_DLFTBLS_H
 
 #include "romfile.h"
-#include "z64actor_profile.h"
+#include "actor_profile.h"
 
 /**
  * @see ACTOROVL_ALLOC_ABSOLUTE

include/z_en_a_obj.h

@@ -2,7 +2,7 @@
 #define Z_EN_A_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
 typedef enum AObjType {

include/z_en_item00.h

@@ -2,7 +2,7 @@
 #define Z_EN_ITEM00_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum Item00Type {
     /* 0x00 */ ITEM00_RUPEE_GREEN,