diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index 0375f54..3e248cb 100644
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -17,8 +17,6 @@
 #define IRRLICHT_VERSION_SVN alpha
 #define IRRLICHT_SDK_VERSION "1.9.0" IRRLICHT_VERSION_MT
 
-#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
-
 #ifdef _WIN32
 #define IRRCALLCONV __stdcall
 #else
diff --git a/include/irrTypes.h b/include/irrTypes.h
index 097fc07..726885e 100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -56,23 +56,19 @@ typedef double				f64;
 } // end namespace irr
 
 
-#include <wchar.h>
-//! Defines for s{w,n}printf_irr because s{w,n}printf methods do not match the ISO C
+//! Defines for snprintf_irr because snprintf method does not match the ISO C
 //! standard on Windows platforms.
 //! We want int snprintf_irr(char *str, size_t size, const char *format, ...);
-//! and int swprintf_irr(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
 #if defined(_MSC_VER)
-#define swprintf_irr swprintf_s
 #define snprintf_irr sprintf_s
 #else
-#define swprintf_irr swprintf
 #define snprintf_irr snprintf
 #endif // _MSC_VER
 
 namespace irr
 {
 
-//! Type name for character type used by the file system.
+//! Type name for character type used by the file system (legacy).
 	typedef char fschar_t;
 	#define _IRR_TEXT(X) X