diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index d0a08b267..0a434dca4 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -163,8 +163,6 @@ file
 	Topic.cpp,
 	CoWork.h,
 	CoWork.cpp,
-	ValueCache.h,
-	ValueCache.cpp,
 	Hash.h,
 	MD5.cpp,
 	SHA1.cpp,
diff --git a/uppsrc/Core/Cpu.cpp b/uppsrc/Core/Cpu.cpp
index de5cc8a0c..a6448c955 100644
--- a/uppsrc/Core/Cpu.cpp
+++ b/uppsrc/Core/Cpu.cpp
@@ -8,6 +8,11 @@
 #endif
 #endif
 
+#ifdef PLATFORM_MACOS
+#include <mach/mach.h>
+#include <mach/vm_statistics.h>
+#endif
+
 namespace Upp {
 
 #ifdef CPU_X86
@@ -129,11 +134,6 @@ int CPU_Cores()
 
 #endif
 
-#ifdef PLATFORM_MACOS
-#include <mach/mach.h>
-#include <mach/vm_statistics.h>
-#endif
-
 void GetSystemMemoryStatus(uint64& total, uint64& available)
 {
 #ifdef PLATFORM_WIN32