diff --git a/Makefile b/Makefile
index a92ce523..b1c3e0d5 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ include Makefile.common
OBJECTS = $(SOURCES_C:.c=.o)
-DEFINES = -DHAVE_INTTYPES_H -D__LIBRETRO__ -DHAVE_MEMORY_H -DINLINE=inline -DFPM_DEFAULT -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DFRONTEND_SUPPORTS_RGB565
+DEFINES = -DHAVE_INTTYPES_H -D__LIBRETRO__ -DHAVE_MEMORY_H -DINLINE=inline -DFPM_DEFAULT -DSIZEOF_INT=4 -DFRONTEND_SUPPORTS_RGB565
ifeq ($(platform), sncps3)
WARNINGS_DEFINES =
diff --git a/libmad/config.h b/libmad/config.h
index 47cd0b0f..70290c20 100644
--- a/libmad/config.h
+++ b/libmad/config.h
@@ -58,12 +58,6 @@
/* The size of a `int', as computed by sizeof. */
#define SIZEOF_INT 4
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff --git a/libmad/mad.h b/libmad/mad.h
index e432cfa7..cc82aa6d 100644
--- a/libmad/mad.h
+++ b/libmad/mad.h
@@ -23,8 +23,6 @@
# define FPM_INTEL
# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
diff --git a/libmad/msvc++/config.h b/libmad/msvc++/config.h
index d655f1a0..d0dba253 100644
--- a/libmad/msvc++/config.h
+++ b/libmad/msvc++/config.h
@@ -58,12 +58,6 @@
/* The size of a `int', as computed by sizeof. */
#define SIZEOF_INT 4
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff --git a/libmad/msvc++/mad.h b/libmad/msvc++/mad.h
index 464c1810..e555c35e 100644
--- a/libmad/msvc++/mad.h
+++ b/libmad/msvc++/mad.h
@@ -25,9 +25,6 @@
# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 18462434..32733f90 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -24,6 +24,6 @@ include $(ROOT_DIR)/Makefile.common
LOCAL_SRC_FILES = $(SOURCES_C)
-LOCAL_CFLAGS += -O3 -DHAVE_LIBMAD -DMUSIC_SUPPORT -DINLINE=inline -DHAVE_INTTYPES_H -DHAVE_MEMORY_H -D__LIBRETRO__ -DFPM_DEFAULT -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DFRONTEND_SUPPORTS_RGB565
+LOCAL_CFLAGS += -O3 -DHAVE_LIBMAD -DMUSIC_SUPPORT -DINLINE=inline -DHAVE_INTTYPES_H -DHAVE_MEMORY_H -D__LIBRETRO__ -DFPM_DEFAULT -DSIZEOF_INT=4 -DFRONTEND_SUPPORTS_RGB565
include $(BUILD_SHARED_LIBRARY)
diff --git a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
index 725a07e8..1aa77a30 100644
--- a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
+++ b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
@@ -22,7 +22,7 @@
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1""
- PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;_XBOX1"
+ PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -91,7 +91,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1""
- PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;_XBOX1"
+ PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"
@@ -127,7 +127,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1""
- PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;_XBOX1"
+ PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"
@@ -163,7 +163,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1""
- PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;_XBOX1"
+ PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index 155c8a9f..0755bdc0 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -769,7 +769,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreadedDebug
- _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
Callcap
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
@@ -789,7 +789,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreadedDebug
- _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ _DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
Callcap
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
@@ -810,7 +810,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
Callcap
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
@@ -835,7 +835,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
@@ -857,7 +857,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;HAVE_STDINT_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ NDEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;HAVE_STDINT_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
@@ -879,7 +879,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;FRONTEND_SUPPORTS_RGB565
+ NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565
src;src/libretro;libmad;%(AdditionalIncludeDirectories)
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index 239ce500..b9c1da16 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -68,7 +68,7 @@
MaxSpeed
true
true
- HAVE_LIBMAD;MUSIC_SUPPORT;_WIN32;HAVE_INTTYPES_H;HAVE_STRLWR;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS
+ HAVE_LIBMAD;MUSIC_SUPPORT;_WIN32;HAVE_INTTYPES_H;HAVE_STRLWR;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS
Windows