diff -r 21a6c17f4e3e -r 629f61203db1 include/Base.h
--- a/include/Base.h	Mon Sep 28 23:39:08 2009 -0700
+++ b/include/Base.h	Tue Sep 29 15:46:42 2009 -0700
@@ -13,17 +13,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#if OSX
-/* OS X specific bits */
-#include <libkern/OSByteOrder.h>
+#ifdef __MACH__ /* OS X specific bits */
 #include <CoreFoundation/CFByteOrder.h>
-
-#else
-/* OS X fixup kludge bits */
-
-#include <cf_fixup.h>
-#include <stdint.h>
-
 #endif
 
 namespace Mooseyard {
@@ -105,7 +96,8 @@
         _value = p._value;
         return *this;
     }
-    
+   
+#ifdef __COREFOUNDATION_CFBYTEORDER__
     template <> inline uint32_t LittleEndian<uint32_t>::makeLittle (uint32_t i) 
     {return OSSwapHostToLittleInt32(i);}
     template <> inline uint32_t LittleEndian<uint32_t>::makeNative (uint32_t i) 
@@ -118,7 +110,21 @@
     {return CFConvertDoubleHostToSwapped(d);}
     template <> inline double LittleEndian<double,CFSwappedFloat64>::makeNative (CFSwappedFloat64 d) 
     {return CFConvertDoubleSwappedToHost(d);}
-    
+#else
+    //FIXME: Not implemented yet for non-Mac platforms
+    template <> inline uint32_t LittleEndian<uint32_t>::makeLittle (uint32_t i) 
+    {return i;}
+    template <> inline uint32_t LittleEndian<uint32_t>::makeNative (uint32_t i) 
+    {return i;}
+    template <> inline uint16_t LittleEndian<uint16_t>::makeLittle (uint16_t i) 
+    {return i;}
+    template <> inline uint16_t LittleEndian<uint16_t>::makeNative (uint16_t i) 
+    {return i;}
+    template <> inline CFSwappedFloat64 LittleEndian<double,CFSwappedFloat64>::makeLittle (double d) 
+    {return d;}
+    template <> inline double LittleEndian<double,CFSwappedFloat64>::makeNative (CFSwappedFloat64 d) 
+    {return d;}
+#endif
 }
 
 #endif /* _MOOSEYARD_BASE_ */