diff --git a/core_main.cpp b/core_main.cpp
index 202e5ba..dd76289 100644
--- a/core_main.cpp
+++ b/core_main.cpp
@@ -226,7 +226,7 @@ For modules it's a bit different cause they should be distributed as valid.
 
 #include "base.cpp"
 #include "base_unicode.cpp"
-
+#include "os.h"
 #if OS_WINDOWS
 #include "os_windows.cpp"
 #elif OS_UNIX
@@ -270,7 +270,9 @@ int main(int argument_count, char **arguments){
   }
 #endif
 
+#if OS_WINDOWS
   test_os_memory();
+#endif
   thread_ctx_init();
   test_unicode();
 
diff --git a/os_windows.cpp b/os_windows.cpp
index 8cb2caa..02a7791 100644
--- a/os_windows.cpp
+++ b/os_windows.cpp
@@ -181,15 +181,6 @@ os_does_file_exist(String path){
   return result;
 }
 
-const U32 LIST_NO_FLAGS           = 0;
-const U32 LIST_RECURSE_INTO_DIRS  = 1;
-
-struct OS_File_Info{
-  String relative_path;
-  String absolute_path;
-  B32 is_directory;
-};
-
 function Array<OS_File_Info>
 os_list_dir(Allocator *a, String dir, U32 flags = LIST_NO_FLAGS){
   Scratch scratch(a);