6 files changed, 10 insertions, 32 deletions
diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h
index dd446d3066..1e67869182 100644
--- a/include/f_pc/f_pc_base.h
+++ b/include/f_pc/f_pc_base.h
@@ -43,9 +43,4 @@ s32 fpcBs_Delete(base_process_class* pProc);
 base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData);
 s32 fpcBs_SubCreate(base_process_class* pProc);
 
-extern "C" {
-void fpcBs_MakeOfType__FPi(void);
-void fpcBs_Is_JustOfType__Fii(void);
-}
-
 #endif
diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h
index a987a5fadb..6c15d16378 100644
--- a/include/f_pc/f_pc_executor.h
+++ b/include/f_pc/f_pc_executor.h
@@ -16,12 +16,4 @@ s32 fpcEx_Execute(base_process_class* pProc);
 s32 fpcEx_ToExecuteQ(base_process_class* pProc);
 void fpcEx_Handler(fpcLnIt_QueueFunc pFunc);
 
-inline base_process_class* i_fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) {
-    return fpcEx_Search(pFunc, pUserData);
-}
-
-extern "C" {
-void fpcEx_IsExist__FUi(void);
-}
-
 #endif
diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index 00e2932174..5081b75a0b 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -6,6 +6,7 @@
 #include "f_pc/f_pc_leaf.h"
 #include "f_pc/f_pc_node.h"
 #include "f_pc/f_pc_stdcreate_req.h"
+#include "f_pc/f_pc_searcher.h"
 
 enum {
     fpcM_ERROR_PROCESS_ID_e = -1,
@@ -70,13 +71,21 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func,
     return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data);
 }
 
+inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) {
+    return fpcEx_Search(pFunc, pUserData);
+}
+
+inline base_process_class* fpcM_SearchByName(s16 name) {
+    return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name);
+}
+
 void fpcM_Draw(void* pProc);
 s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
 s32 fpcM_Execute(void* pProc);
 s32 fpcM_Delete(void* pProc);
 BOOL fpcM_IsCreating(unsigned int pID);
 void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2);
-void fpcM_Init(void);
+void fpcM_Init();
 base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3,
                                     void* pData);
 s32 fpcM_IsPause(void* pProc, u8 param_2);
@@ -84,8 +93,4 @@ void fpcM_PauseEnable(void* pProc, u8 param_2);
 void fpcM_PauseDisable(void* pProc, u8 param_2);
 void* fpcM_JudgeInLayer(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
 
-extern "C" {
-void fpcM_Delete__FPv(void);
-}
-
 #endif
diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h
index d1ed8f3008..d319d2420c 100644
--- a/include/f_pc/f_pc_priority.h
+++ b/include/f_pc/f_pc_priority.h
@@ -33,6 +33,4 @@ s32 fpcPi_Handler(void);
 s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID,
                u16 priority);
 
-extern s8 data_804505F0;  // roomReadId
-
 #endif
diff --git a/include/f_pc/f_pc_searcher.h b/include/f_pc/f_pc_searcher.h
index 9d416236bc..4b078a7887 100644
--- a/include/f_pc/f_pc_searcher.h
+++ b/include/f_pc/f_pc_searcher.h
@@ -8,12 +8,4 @@
 void* fpcSch_JudgeForPName(void* pProc, void* pUserData);
 void* fpcSch_JudgeByID(void* pProc, void* pUserData);
 
-extern "C" {
-void fpcSch_JudgeForPName__FPvPv(void);
-}
-
-inline base_process_class* i_fpcM_SearchByName(s16 name) {
-    return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name);
-}
-
 #endif
diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h
index 0184402c7d..0753650c74 100644
--- a/include/f_pc/f_pc_stdcreate_req.h
+++ b/include/f_pc/f_pc_stdcreate_req.h
@@ -27,8 +27,4 @@ s32 fpcSCtRq_Cancel(standard_create_request_class*);
 s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4,
                      void* param_5);
 
-extern "C" {
-void fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv(void);
-}
-
 #endif
 \ No newline at end of file