diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e97d7c..4572f9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,11 +45,13 @@ endmacro()
 IF(APPLE)
    # SET(GUI_TYPE MACOSX_BUNDLE)
    # INCLUDE_DIRECTORIES ( /Developer/Headers/FlatCarbon )
+   FIND_LIBRARY(APPKIT_LIBRARY AppKit)
    FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
    FIND_LIBRARY(AUDIO_TOOLBOX_LIBRARY AudioToolbox)
-   MARK_AS_ADVANCED (OPENGL_LIBRARY
+   MARK_AS_ADVANCED (APPKIT_LIBRARY
+                     OPENGL_LIBRARY
                      AUDIO_TOOLBOX_LIBRARY)
-   SET(EXTRA_LIBS ${OPENGL_LIBRARY} ${AUDIO_TOOLBOX_LIBRARY})
+   SET(EXTRA_LIBS ${APPKIT_LIBRARY} ${OPENGL_LIBRARY} ${AUDIO_TOOLBOX_LIBRARY})
    FIND_PATH(COCOA_INCLUDE_DIR OpenGL/gl3.h)
 ENDIF (APPLE)
 
diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt
index 3f62459..b1dcd34 100644
--- a/kraken/CMakeLists.txt
+++ b/kraken/CMakeLists.txt
@@ -22,4 +22,20 @@ add_sources(KRAnimationLayer.cpp)
 add_sources(KRAnimationManager.cpp)
 add_sources(KRAudioBuffer.cpp)
 add_sources(KRAudioManager.cpp)
+add_sources(KRAudioSample.cpp)
+add_sources(KRAudioSource.cpp)
+add_sources(KRBehavior.cpp)
 add_sources(KRDataBlock.cpp)
+add_sources(KRBone.cpp)
+add_sources(KRBundle.cpp)
+add_sources(KRBundleManager.cpp)
+add_sources(KRCamera.cpp)
+add_sources(KRCollider.cpp)
+add_sources(KRContext.cpp)
+IF(APPLE)
+  IF(IOS)
+    add_sources(KRContext_ios.mm)
+  ELSE()
+    add_sources(KRContext_osx.mm)
+  ENDIF()
+ENDIF (APPLE)
diff --git a/kraken/KRCamera.cpp b/kraken/KRCamera.cpp
index 83677d9..551d28d 100755
--- a/kraken/KRCamera.cpp
+++ b/kraken/KRCamera.cpp
@@ -1064,6 +1064,9 @@ std::string KRCamera::getDebugText()
                     case KRNode::RENDER_PASS_SHADOWMAP:
                         stream << "shadow";
                         break;
+                    default:
+                        // Suppress warnings
+                        break;
                 }
                 stream << "\t" << (*itr).object_name << "\t" << (*itr).material_name;
                 vertex_count += (*itr).vertex_count;
@@ -1085,6 +1088,9 @@ std::string KRCamera::getDebugText()
     case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_SIREN_AMBIENT_ZONES:
         stream << "Siren - Ambient Zones";
         break;
+    case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_NUMBER:
+        // Suppress warning
+        break;
     }
     return stream.str();
 }
diff --git a/kraken/KRContext_osx.mm b/kraken/KRContext_osx.mm
index 5ba2377..94d18a6 100755
--- a/kraken/KRContext_osx.mm
+++ b/kraken/KRContext_osx.mm
@@ -7,6 +7,7 @@
 //
 
 #include "KREngine-common.h"
+#include <AppKit/AppKit.h>
 
 #include "KRContext.h"