diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml
index 6be4998c..2324d54b 100644
--- a/decompressed.pal.yaml
+++ b/decompressed.pal.yaml
@@ -185,7 +185,7 @@ segments:
   - [0xF59F60, c, stub_1D590]
   - [0xF59F90, hasm, code_1D5C0]
   - [0xF59FA0, c, code_1D5D0]
-  - [0xF5AD30, c, code_1E360]
+  - [0xF5AD30, c, sns]
   - [0xF5B0B0, c, code_1E6E0]
   - [0xF5B1F0, hasm, code_1E820]
   - [0xF5B290, c, audio/n_sl]
@@ -387,7 +387,7 @@ segments:
   - [0xF75D60, .data, code_18350]
   - [0xF75EE0, .data, code_1BE90]
   - [0xF75EF0, .data, code_1D5D0]
-  - [0xF75F10, .data, code_1E360]
+  - [0xF75F10, .data, sns]
   - [0xF75F20, .data, data_1E820]
   - [0xF75F30, .data, audio/n_sl]
   - [0xF75F40, .data, audio/n_drvrNew]
@@ -478,7 +478,7 @@ segments:
   - [0xF791D0, .bss, memory]
   - [0xF791D0, .bss, ucode]
   - [0xF791D0, .bss, code_1D5D0]
-  - [0xF791D0, .bss, code_1E360]
+  - [0xF791D0, .bss, sns]
   - [0xF791D0, .bss, os/initialize]
   - [0xF791D0, .bss, io/pimgr]
   - [0xF791D0, .bss, io/sptask]
diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml
index 52688c67..4beae8ec 100644
--- a/decompressed.us.v10.yaml
+++ b/decompressed.us.v10.yaml
@@ -186,7 +186,7 @@ segments:
   - [0xF367E0, c, stub_1D590]                 #DONE
   - [0xF36810, hasm, code_1D5C0]              #DONE
   - [0xF36820, c, code_1D5D0]                 #DONE
-  - [0xF375B0, c, code_1E360]                 #DONE
+  - [0xF375B0, c, sns]                 #DONE
   - [0xF37930, c, code_1E6E0]                 #DONE
   - [0xF37A70, hasm, code_1E820]              #DONE
   - [0xF37B10, c, audio/n_sl]                 #DONE
@@ -388,7 +388,7 @@ segments:
   - [0xF524E0, .data, code_18350]
   - [0xF52660, .data, code_1BE90]
   - [0xF52670, .data, code_1D5D0]
-  - [0xF52690, .data, code_1E360]
+  - [0xF52690, .data, sns]
   - [0xF526A0, .data, data_1E820]
   - [0xF526B0, .data, audio/n_sl]
   - [0xF526C0, .data, audio/n_drvrNew]
@@ -479,7 +479,7 @@ segments:
   - [0xF55960, .bss, memory]
   - [0xF55960, .bss, ucode]
   - [0xF55960, .bss, code_1D5D0]
-  - [0xF55960, .bss, code_1E360]
+  - [0xF55960, .bss, sns]
   - [0xF55960, .bss, os/initialize]
   - [0xF55960, .bss, io/pimgr]
   - [0xF55960, .bss, io/sptask]
diff --git a/include/core1/core1.h b/include/core1/core1.h
index 44db60eb..dac52a53 100644
--- a/include/core1/core1.h
+++ b/include/core1/core1.h
@@ -9,6 +9,7 @@
 #include "core1/mem.h"
 #include "core1/pfsmanager.h"
 #include "core1/rarezip.h"
+#include "core1/sns.h"
 #include "core1/ucode.h"
 #include "core1/viewport.h"
 
diff --git a/include/SnS.h b/include/core1/sns.h
similarity index 98%
rename from include/SnS.h
rename to include/core1/sns.h
index ab978aad..9a3f9dfa 100644
--- a/include/SnS.h
+++ b/include/core1/sns.h
@@ -1,6 +1,5 @@
-#ifndef __SNS_H__
-#define __SNS_H__
-#include <ultra64.h>
+#ifndef BANJO_KAZOOIE_CORE1_SNS_H
+#define BANJO_KAZOOIE_CORE1_SNS_H
 
 /**
  * sns sets
diff --git a/src/FP/code_ABD0.c b/src/FP/code_ABD0.c
index a377e63b..b36fcec6 100644
--- a/src/FP/code_ABD0.c
+++ b/src/FP/code_ABD0.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "prop.h"
-#include "SnS.h"
 #include "actor.h"
 
 extern ActorInfo D_80367FE0;
diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c
index b458937b..f6a6403e 100644
--- a/src/GV/code_7FF0.c
+++ b/src/GV/code_7FF0.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 #include "actor.h"
 
 extern void func_80244BB0(s32, s32, s32, f32);
diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c
index 763dfc70..642a84c3 100644
--- a/src/MMM/code_2040.c
+++ b/src/MMM/code_2040.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 #include "actor.h"
 
 extern ActorInfo D_8038BC28;
diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c
index 55759d90..9c554008 100644
--- a/src/TTC/code_26D0.c
+++ b/src/TTC/code_26D0.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "prop.h"
-#include "SnS.h"
 #include "actor.h"
 
 extern ActorInfo gChClam;
diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c
index a814f789..477a27cb 100644
--- a/src/TTC/code_3E30.c
+++ b/src/TTC/code_3E30.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include "SnS.h"
 
 /* extern */
 extern void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e);
diff --git a/src/core1/code_1D5D0.c b/src/core1/code_1D5D0.c
index ec7d83f0..e39c6e7e 100644
--- a/src/core1/code_1D5D0.c
+++ b/src/core1/code_1D5D0.c
@@ -2,7 +2,6 @@
 #include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 #include "save.h"
 
 bool snsToRestoreItems = FALSE;
diff --git a/src/core1/code_CE60.c b/src/core1/code_CE60.c
index dd3e9073..43a5fa26 100644
--- a/src/core1/code_CE60.c
+++ b/src/core1/code_CE60.c
@@ -2,7 +2,6 @@
 #include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 
 typedef struct {
     s16 x_min;
diff --git a/src/core1/memory.c b/src/core1/memory.c
index 43b6d10e..e2d65102 100644
--- a/src/core1/memory.c
+++ b/src/core1/memory.c
@@ -2,7 +2,6 @@
 #include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 #include "version.h"
 /* 
  *  Every chunk of allocated memory is prefixed with a HeapHeader.
diff --git a/src/core1/code_1E360.c b/src/core1/sns.c
similarity index 99%
rename from src/core1/code_1E360.c
rename to src/core1/sns.c
index 884ef948..a2c760c4 100644
--- a/src/core1/code_1E360.c
+++ b/src/core1/sns.c
@@ -2,7 +2,6 @@
 #include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 
 /* .data*/
 /**
diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c
index f5e3b51c..04515264 100644
--- a/src/core2/ba/marker.c
+++ b/src/core2/ba/marker.c
@@ -1,10 +1,10 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "core2/ba/physics.h"
 #include "version.h"
 #include "prop.h"
-#include "SnS.h"
 
 extern void func_803012F8(void);
 extern f32 ml_distanceSquared_vec3f(f32 arg0[3], f32 arg1[3]);
diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c
index 6debb0ed..4c70d499 100644
--- a/src/core2/code_4C020.c
+++ b/src/core2/code_4C020.c
@@ -1,9 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include "SnS.h"
-
 extern f32 ml_vec3f_horizontal_distance_zero_likely(f32 [3], f32[3]);
 extern void func_8025A788(enum comusic_e, f32, f32);
 extern void func_8031CC40(enum map_e, s32);
diff --git a/src/core2/code_9B650.c b/src/core2/code_9B650.c
index a171866b..85e648eb 100644
--- a/src/core2/code_9B650.c
+++ b/src/core2/code_9B650.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include "SnS.h"
 
 typedef struct{
     s16 unk0;