diff --git a/mednafen/cdrom/CDAccess.h b/mednafen/cdrom/CDAccess.h
index d7a9a3e..24dddfe 100644
--- a/mednafen/cdrom/CDAccess.h
+++ b/mednafen/cdrom/CDAccess.h
@@ -1,7 +1,7 @@
 #ifndef __MDFN_CDROMFILE_H
 #define __MDFN_CDROMFILE_H
 
-#include <stdio.h>
+#include <stdint.h>
 
 #include "CDUtility.h"
 
diff --git a/mednafen/mednafen-driver.h b/mednafen/mednafen-driver.h
deleted file mode 100644
index 90c183a..0000000
--- a/mednafen/mednafen-driver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __MDFN_MEDNAFEN_DRIVER_H
-#define __MDFN_MEDNAFEN_DRIVER_H
-
-#include <stdio.h>
-
-void MDFN_DispMessage(const char *format, ...);
-
-#endif
diff --git a/mednafen/mednafen.h b/mednafen/mednafen.h
index 56b423b..6436318 100644
--- a/mednafen/mednafen.h
+++ b/mednafen/mednafen.h
@@ -11,10 +11,8 @@
 #include "math_ops.h"
 #include "git.h"
 #include "settings.h"
-#include "mednafen-driver.h"
 #include "mednafen-endian.h"
 
-
 #ifdef _WIN32
 #define strcasecmp _stricmp
 #endif
diff --git a/mednafen/pce_fast/input.cpp b/mednafen/pce_fast/input.cpp
index d150c1d..3f82cb6 100644
--- a/mednafen/pce_fast/input.cpp
+++ b/mednafen/pce_fast/input.cpp
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include "../mednafen-types.h"
-#include "../mednafen-driver.h"
 #include "../state_helpers.h"
 #include "../mednafen.h"
 
diff --git a/mednafen/settings.c b/mednafen/settings.c
index 869ffc6..817478b 100644
--- a/mednafen/settings.c
+++ b/mednafen/settings.c
@@ -17,7 +17,6 @@
 
 #include <boolean.h>
 
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include "settings.h"
@@ -52,19 +51,12 @@ uint64_t MDFN_GetSettingUI(const char *name)
    if (!strcmp("pce_fast.hoverscan", name))
       return setting_pce_hoverscan; 
 
-   fprintf(stderr, "unhandled setting UI: %s\n", name);
-   return 0;
-}
-
-int64_t MDFN_GetSettingI(const char *name)
-{
-   fprintf(stderr, "unhandled setting I: %s\n", name);
    return 0;
 }
 
 double MDFN_GetSettingF(const char *name)
 {
-   fprintf(stderr, "unhandled setting F: %s\n", name);
+   /* TODO/FIXME - handle 'pce_fast.mouse_sensitivity' */
    return 0;
 }
 
@@ -91,6 +83,5 @@ bool MDFN_GetSettingB(const char *name)
       return 0;
    if (!strcmp("pce_fast.adpcmlp", name))
       return 0;
-   fprintf(stderr, "unhandled setting B: %s\n", name);
    return 0;
 }
diff --git a/mednafen/settings.h b/mednafen/settings.h
index 0f9108f..7e96b75 100644
--- a/mednafen/settings.h
+++ b/mednafen/settings.h
@@ -19,7 +19,6 @@ extern uint32_t setting_pce_fast_cdspeed;
 extern bool OrderOfGriffonFix;
 
 uint64 MDFN_GetSettingUI(const char *name);
-int64 MDFN_GetSettingI(const char *name);
 double MDFN_GetSettingF(const char *name);
 bool MDFN_GetSettingB(const char *name);