7 files changed, 20 insertions, 5 deletions
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index f74efa32b..98f0d9b8c 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -38,7 +38,7 @@ struct Unk03006370
 
 static void sub_81D5084(u8);
 
-extern struct Unk03006370 gUnknown_03006370;
+struct Unk03006370 gUnknown_03006370;
 
 extern const u8 gUnknown_089A3470[];
 extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
diff --git a/src/librfu.c b/src/librfu.c
new file mode 100644
index 000000000..cdf14b693
--- /dev/null
+++ b/src/librfu.c
@@ -0,0 +1,9 @@
+#include "global.h"
+#include "librfu.h"
+
+struct RfuUnk1* gUnknown_03007870[4];
+struct RfuUnk2* gUnknown_03007880[4];
+struct RfuUnk5 *gUnknown_03007890;
+u32 *gUnknown_03007894;
+struct RfuUnk3* gUnknown_03007898;
+u8 gUnknown_030078A0[12];
diff --git a/src/librfu_intr.c b/src/librfu_intr.c
index bdf8b072a..c6db9a50c 100644
--- a/src/librfu_intr.c
+++ b/src/librfu_intr.c
@@ -1,4 +1,5 @@
 #include "global.h"
 #include "main.h"
+#include "librfu.h"
 
 //TODO: decompile asm/librfu_intr.s to here
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index 556b79bf8..670692118 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "librfu.h"
 
+struct RfuStruct *gRfuState;
+
 extern IntrFunc IntrSIO32(void);
 
 extern void STWI_stop_timer(void);
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 4a457adc4..3a64497bd 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -250,8 +250,8 @@ bool32 sub_802E2D0(struct PokemonJump1_82E4 *, int);
 int sub_802E354(int, u16, u16);
 void sub_802E3A8(void);
 
-extern struct PokemonJump1 *gUnknown_02022CFC;
-extern struct PokemonJump2 *gUnknown_02022D00;
+EWRAM_DATA struct PokemonJump1 *gUnknown_02022CFC = NULL;
+EWRAM_DATA struct PokemonJump2 *gUnknown_02022D00 = NULL;
 
 const struct PokemonJumpMons gPkmnJumpSpecies[] =
 {
diff --git a/src/pokenav_unk_10.c b/src/pokenav_unk_10.c
index dcdbacfb9..dd91e930a 100644
--- a/src/pokenav_unk_10.c
+++ b/src/pokenav_unk_10.c
@@ -36,8 +36,8 @@ extern const u8 gText_RibbonsF700[];
 extern const u8 *const gRibbonDescriptionPointers[][2];
 extern const u8 *const gGiftRibbonDescriptionPointers[][2];
 
-extern u32 gUnknown_030012C0;
-extern u32 gUnknown_030012C4;
+static u32 gUnknown_030012C0;
+static u32 gUnknown_030012C4;
 
 void sub_81D0E84(struct Pokenav10Struct2 *structPtr);
 void sub_81D0FF0(struct Pokenav10Struct2 *structPtr);
diff --git a/src/pokenav_unk_7.c b/src/pokenav_unk_7.c
new file mode 100644
index 000000000..af48fbb1f
--- /dev/null
+++ b/src/pokenav_unk_7.c
@@ -0,0 +1,3 @@
+#include "global.h"
+
+BSS_DATA u8 gUnknown_030012BC;