diff --git a/osx/cpu.cc b/osx/cpu.cc
index 71aaa3a..5f92aa3 100644
--- a/osx/cpu.cc
+++ b/osx/cpu.cc
@@ -1,17 +1,8 @@
-#include <mach/vm_statistics.h>
-#include <mach/processor_info.h>
-#include <mach/mach_types.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/host_info.h>
-#include <mach/mach_error.h>
-#include <mach/vm_map.h>
 #include <mach/mach.h>
-#include <sys/sysctl.h> // for sysctl
-#include <sys/types.h> // for integer types
-
 #include <unistd.h> // usleep()
 
+#include "cpu.h"
+
 // 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 cea49cc..5469f46 100644
--- a/osx/load.cc
+++ b/osx/load.cc
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <stdlib.h> // getloadavg()
 
+#include "load.h"
 #include "../luts.h"
 
 std::string load_string( bool use_colors = false ) {
diff --git a/osx/memory.cc b/osx/memory.cc
index 1bac364..0c2f8e1 100644
--- a/osx/memory.cc
+++ b/osx/memory.cc
@@ -1,18 +1,9 @@
 #include <string>
 #include <sstream>
-
-#include <mach/vm_statistics.h>
-#include <mach/processor_info.h>
-#include <mach/mach_types.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/host_info.h>
-#include <mach/mach_error.h>
-#include <mach/vm_map.h>
 #include <mach/mach.h>
 #include <sys/sysctl.h> // for sysctl
-#include <sys/types.h> // for integer types
 
+#include "memory.h"
 #include "../luts.h"
 
 std::string mem_string( bool use_colors ) {