diff --git a/include/graphics.h b/include/graphics.h
index 37509783d0..7d96c5ef9e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -7712,7 +7712,6 @@ extern const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[];
 extern const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[];
 #endif
 
-
 // berry tag screen
 extern const u32 gBerryCheck_Gfx[];
 extern const u32 gBerryCheck_Pal[];
diff --git a/include/pokedex.h b/include/pokedex.h
index a280248981..96cd02affb 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -36,7 +36,7 @@ void ResetPokedex(void);
 u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
 u16 GetNationalPokedexCount(u8);
 u16 GetHoennPokedexCount(u8);
-u8 DisplayCaughtMonDexPage(u16 species, u32 otId, u32 personality);
+u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality);
 s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
 bool16 HasAllHoennMons(void);
diff --git a/include/pokedex_plus_hgss.h b/include/pokedex_plus_hgss.h
index 45367cc4bb..d8879dc7bb 100644
--- a/include/pokedex_plus_hgss.h
+++ b/include/pokedex_plus_hgss.h
@@ -1,11 +1,9 @@
 #ifndef GUARD_POKEDEX_PLUS_HGSS_H
 #define GUARD_POKEDEX_PLUS_HGSS_H
 
-extern u8 gUnusedPokedexU8;
-extern void (*gPokedexVBlankCB)(void);
-
-
+#if POKEDEX_PLUS_HGSS == TRUE
 void CB2_OpenPokedexPlusHGSS(void);
 u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum);
+#endif
 
 #endif // GUARD_POKEDEX_PLUS_HGSS_H
diff --git a/include/strings.h b/include/strings.h
index 1382e562dc..da9ea1273c 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -658,7 +658,6 @@ extern const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[];
 extern const u8 gText_FORMS_NONE[];
 #endif
 
-
 // birch dex rating text
 extern const u8 gBirchDexRatingText_LessThan10[];
 extern const u8 gBirchDexRatingText_LessThan20[];
diff --git a/src/daycare.c b/src/daycare.c
index b577fe68ca..42493bb92b 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -806,7 +806,6 @@ u8 GetEggMovesSpecies(u16 species, u16 *eggMoves)
 
     return numEggMoves;
 }
-#endif
 
 bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui
 {
@@ -832,6 +831,7 @@ bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HG
     }
     return FALSE;
 }
+#endif
 
 static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
 {
diff --git a/src/pokedex.c b/src/pokedex.c
index b0b19a4556..7da3226bc1 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -14,7 +14,9 @@
 #include "overworld.h"
 #include "palette.h"
 #include "pokedex.h"
+#if POKEDEX_PLUS_HGSS == TRUE
 #include "pokedex_plus_hgss.h"
+#endif
 #include "pokedex_area_screen.h"
 #include "pokedex_cry_screen.h"
 #include "scanline_effect.h"