diff --git a/mednafen/driver.h b/mednafen/driver.h
index 7b7282e..fd6f250 100644
--- a/mednafen/driver.h
+++ b/mednafen/driver.h
@@ -2,7 +2,6 @@
 #define _MDFN_DRIVERH
 
 #include "mednafen-types.h"
-#include <stdio.h> // REMOVE ME eventually
 #include "git.h"
 #include "settings-driver.h"
 #include "mednafen-driver.h"
diff --git a/mednafen/general.cpp b/mednafen/general.cpp
index 97d4717..4f69217 100644
--- a/mednafen/general.cpp
+++ b/mednafen/general.cpp
@@ -166,43 +166,6 @@ std::string MDFN_EvalFIP(const std::string &dir_path, const std::string &rel_pat
  }
 }
 
-
-typedef std::map<char, std::string> FSMap;
-
-static std::string EvalPathFS(const std::string &fstring, /*const (won't work because entry created if char doesn't exist) */ FSMap &fmap)
-{
- std::string ret = "";
- const char *str = fstring.c_str();
- bool in_spec = false;
-
- while(*str)
- {
-  int c = *str;
-
-  if(!in_spec && c == '%')
-   in_spec = true;
-  else if(in_spec == true)
-  {
-   if(c == '%')
-    ret = ret + std::string("%");
-   else
-    ret = ret + fmap[(char)c];
-   in_spec = false;
-  }
-  else
-  {
-   char ct[2];
-   ct[0] = c;
-   ct[1] = 0;
-   ret += std::string(ct);
-  }
-
-  str++;
- }
-
- return(ret);
-}
-
 const char * GetFNComponent(const char *str)
 {
  const char *tp1;
@@ -228,18 +191,6 @@ const char * GetFNComponent(const char *str)
   return(str);
 }
 
-char *MDFN_RemoveControlChars(char *str)
-{
- char *orig = str;
- if(str)
-  while(*str)
-  {
-   if(*str < 0x20) *str = 0x20;
-   str++;
-  }
- return(orig);
-}
-
 // Remove whitespace from beginning of string
 void MDFN_ltrim(char *string)
 {
diff --git a/mednafen/general.h b/mednafen/general.h
index 4dccbad..65c1f25 100644
--- a/mednafen/general.h
+++ b/mednafen/general.h
@@ -11,7 +11,6 @@ void GetFileBase(const char *f);
 bool MDFN_IsFIROPSafe(const std::string &path);
 
 std::string MDFN_MakeFName(int type, int id1, const char *cd1);
-char *MDFN_RemoveControlChars(char *str);
 
 void MDFN_ltrim(char *string);
 void MDFN_rtrim(char *string);
diff --git a/mednafen/settings.cpp b/mednafen/settings.cpp
index aa763e2..91789a0 100644
--- a/mednafen/settings.cpp
+++ b/mednafen/settings.cpp
@@ -19,9 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <string>
-#include <list>
 #include "settings.h"
-#include "md5.h"
 
 bool MDFN_SaveSettings(const char *path)
 {