diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
index f1f9a7518..5627f8c3f 100644
--- a/desmume/src/NDSSystem.h
+++ b/desmume/src/NDSSystem.h
@@ -294,6 +294,9 @@ void NDS_Reset();
 int NDS_ImportSave(const char *filename);
 bool NDS_ExportSave(const char *filename);
 
+void nds_savestate(std::ostream* os);
+bool nds_loadstate(std::istream* is, int size);
+
 int NDS_WriteBMP(const char *filename);
 int NDS_LoadFirmware(const char *filename);
 int NDS_CreateDummyFirmware( struct NDS_fw_config_data *user_settings);
diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp
index 7953cd059..851110d40 100644
--- a/desmume/src/saves.cpp
+++ b/desmume/src/saves.cpp
@@ -259,9 +259,6 @@ SFORMAT SF_MOVIE[]={
 	{ 0 }
 };
 
-void nds_savestate(std::ostream* os);
-bool nds_loadstate(std::istream* is, int size);
-
 static void mmu_savestate(std::ostream* os)
 {
 	//version