diff --git a/src/mpd_types.h b/src/mpd_types.h
index c0e519dde..7e64daba1 100644
--- a/src/mpd_types.h
+++ b/src/mpd_types.h
@@ -26,16 +26,16 @@ typedef signed char	mpd_sint8;
 typedef unsigned short 	mpd_uint16;
 typedef signed short	mpd_sint16;
 #elif SIZEOF_INT == 2
-typedef unsigned short 	mpd_uint16;
-typedef signed short	mpd_sint16;
+typedef unsigned int 	mpd_uint16;
+typedef signed int	mpd_sint16;
 #endif
 
 #if SIZEOF_INT == 4
 typedef unsigned int 	mpd_uint32;
 typedef signed int	mpd_sint32;
 #elif SIZEOF_LONG == 4
-typedef unsigned int 	mpd_uint32;
-typedef signed int	mpd_sint32;
+typedef unsigned long 	mpd_uint32;
+typedef signed long	mpd_sint32;
 #endif
 
 #endif