diff --git a/.gitignore b/.gitignore
index d0ecef8..3f51360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.o
 *.so
 sysstat
+tmux-mem-cpu-load
 
 # CMake generated #
 ###################
@@ -17,7 +18,6 @@ CMakeCache.txt
 install_manifest.txt
 version.h
 CTestTestfile.cmake
-tmux-mem-cpu-load
 DartConfiguration.tcl
 
 # Packages #
@@ -49,3 +49,4 @@ ehthumbs.db
 Thumbs.db
 *.swp
 *.swo
+*~
diff --git a/osx/cpu.cc b/osx/cpu.cc
index c670793..71aaa3a 100644
--- a/osx/cpu.cc
+++ b/osx/cpu.cc
@@ -10,6 +10,8 @@
 #include <sys/sysctl.h> // for sysctl
 #include <sys/types.h> // for integer types
 
+#include <unistd.h> // usleep()
+
 // OSX or BSD based system, use BSD APIs instead
 // See: http://www.opensource.apple.com/source/xnu/xnu-201/osfmk/mach/host_info.h
 // and: http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/
diff --git a/osx/load.cc b/osx/load.cc
index fd31d60..e6b5b96 100644
--- a/osx/load.cc
+++ b/osx/load.cc
@@ -1,10 +1,13 @@
 #include <string>
 #include <sstream>
 #include <fstream>
+#include <cmath> // floorf()
 
 #include <unistd.h>
 #include <stdlib.h> // getloadavg()
 
+#include "../luts.h"
+
 std::string load_string( bool use_colors = false ) {
    std::ostringstream oss;
 
diff --git a/osx/memory.cc b/osx/memory.cc
index 59782a4..1bac364 100644
--- a/osx/memory.cc
+++ b/osx/memory.cc
@@ -1,6 +1,5 @@
 #include <string>
-#include <sstring>
-#include <fstring>
+#include <sstream>
 
 #include <mach/vm_statistics.h>
 #include <mach/processor_info.h>
@@ -14,6 +13,8 @@
 #include <sys/sysctl.h> // for sysctl
 #include <sys/types.h> // for integer types
 
+#include "../luts.h"
+
 std::string mem_string( bool use_colors ) {
    std::ostringstream oss;