From 0350836d94c83f681bbe1803f7b9427324fbf307 Mon Sep 17 00:00:00 2001
From: engineer124 <engineer124engineer124@gmail.com>
Date: Sat, 28 Oct 2023 08:11:01 +1100
Subject: [PATCH] fix merge

---
 src/code/z_message.c        | 1 +
 src/libultra/gu/lookat.c    | 2 +-
 src/libultra/gu/lookathil.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/code/z_message.c b/src/code/z_message.c
index 4bc104fec..dff2aac01 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64horse.h"
 #include "z64shrink_window.h"
diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c
index 692bb089a..09aa16310 100644
--- a/src/libultra/gu/lookat.c
+++ b/src/libultra/gu/lookat.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "macros.h"
+#include "z64math.h"
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;
diff --git a/src/libultra/gu/lookathil.c b/src/libultra/gu/lookathil.c
index ef8b443db..366e6d9f2 100644
--- a/src/libultra/gu/lookathil.c
+++ b/src/libultra/gu/lookathil.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "macros.h"
+#include "z64math.h"
 
 void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt,
                      f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, /* light 1 direction */