diff -r 775a72905708 -r a12155461b34 misc/libtremor/tremor/os_types.h
--- a/misc/libtremor/tremor/os_types.h	Sun Oct 28 03:48:37 2012 +0100
+++ b/misc/libtremor/tremor/os_types.h	Sun Oct 28 04:00:07 2012 +0100
@@ -40,7 +40,6 @@
    typedef __int32 ogg_int32_t;
    typedef unsigned __int32 ogg_uint32_t;
    typedef __int16 ogg_int16_t;
-   typedef unsigned __int16 ogg_uint16_t;
 #  else
    /* Cygwin */
    #include <_G_config.h>
@@ -48,23 +47,20 @@
    typedef _G_int32_t ogg_int32_t;
    typedef _G_uint32_t ogg_uint32_t;
    typedef _G_int16_t ogg_int16_t;
-   typedef _G_uint16_t ogg_uint16_t;
 #  endif
 
 #elif defined(__MACOS__)
 
 #  include <sys/types.h>
    typedef SInt16 ogg_int16_t;
-   typedef UInt16 ogg_uint16_t;
    typedef SInt32 ogg_int32_t;
    typedef UInt32 ogg_uint32_t;
    typedef SInt64 ogg_int64_t;
 
-#elif defined(__MACOSX__) /* MacOS X Framework build */
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
 
 #  include <sys/types.h>
    typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
    typedef int32_t ogg_int32_t;
    typedef u_int32_t ogg_uint32_t;
    typedef int64_t ogg_int64_t;
@@ -78,7 +74,6 @@
 
    /* OS/2 GCC */
    typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
    typedef int ogg_int32_t;
    typedef unsigned int ogg_uint32_t;
    typedef long long ogg_int64_t;