src/core1: reorganized header files

src/core2/gc/dialog.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
 #include "zoombox.h"
-#include "core1/pfsmanager.h"
 
 extern void func_803114D0(void );
 extern int func_803114B0(void);

src/core2/gc/pauseMenu.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "ml/mtx.h"
-#include <core1/viewport.h>
 
 #include "zoombox.h"
 
@@ -31,9 +31,6 @@ f32 func_8024DE1C(f32, f32, f32 *, f32 *);
 void func_80310D2C(void);
 
 s32 level_get(void);
-void func_8024E6E0(s32, void *);
-void func_8024E60C(s32, void *);
-void controller_getJoystick(s32, void *);
 s32 getGameMode(void);
 
 void func_802DC5B8(void);

src/core2/gc/sky.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 typedef struct {
     s16 model_id;

src/core2/gc/transition.c

@@ -1,8 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-
-#include <core1/viewport.h>
 #include "gc/gctransition.h"
 
 void animctrl_setAnimTimer(AnimCtrl*, f32);

src/core2/gc/zoombox.c

@@ -1,10 +1,10 @@
 #include <ultra64.h>
+#include "core1/core1.h"
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "zoombox.h"
 #include "ml/mtx.h"
-#include <core1/viewport.h>
-#include "core1/pfsmanager.h"
 
 
 void func_80252330(f32, f32, f32);