diff --git a/libc/src/threads/linux/thrd_create.cpp b/libc/src/threads/linux/thrd_create.cpp
@@ -7,11 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/threads/thrd_create.h"
-#include "config/linux/syscall.h" // For syscall function.
-#include "include/errno.h"        // For E* error values.
-#include "include/sys/mman.h"     // For PROT_* and MAP_* definitions.
-#include "include/sys/syscall.h"  // For syscall numbers.
-#include "include/threads.h"      // For thrd_* type definitions.
+#include "include/errno.h"                // For E* error values.
+#include "include/sys/mman.h"             // For PROT_* and MAP_* definitions.
+#include "include/sys/syscall.h"          // For syscall numbers.
+#include "include/threads.h"              // For thrd_* type definitions.
+#include "src/__support/OSUtil/syscall.h" // For syscall function.
 #include "src/__support/common.h"
 #include "src/errno/llvmlibc_errno.h"
 #include "src/sys/mman/mmap.h"

diff --git a/libc/src/threads/linux/thrd_join.cpp b/libc/src/threads/linux/thrd_join.cpp
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/threads/thrd_join.h"
-#include "config/linux/syscall.h" // For syscall function.
-#include "include/sys/syscall.h"  // For syscall numbers.
-#include "include/threads.h"      // For thrd_* type definitions.
+#include "include/sys/syscall.h"          // For syscall numbers.
+#include "include/threads.h"              // For thrd_* type definitions.
+#include "src/__support/OSUtil/syscall.h" // For syscall function.
 #include "src/__support/common.h"
 #include "src/sys/mman/munmap.h"
 #include "src/threads/linux/Futex.h"

diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
@@ -6,7 +6,7 @@ add_entrypoint_object(
     ../write.h
   DEPENDS
     libc.include.unistd
-    libc.config.linux.linux_syscall_h
     libc.include.sys_syscall
+    libc.src.__support.OSUtil.osutil
     libc.src.errno.__errno_location
 )
diff --git a/libc/src/unistd/linux/write.cpp b/libc/src/unistd/linux/write.cpp
@@ -8,8 +8,8 @@
 
 #include "src/unistd/write.h"
 
-#include "config/linux/syscall.h" // For internal syscall function.
-#include "include/sys/syscall.h"  // For syscall numbers.
+#include "include/sys/syscall.h"          // For syscall numbers.
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
 #include "src/errno/llvmlibc_errno.h"
 

diff --git a/libc/test/CMakeLists.txt b/libc/test/CMakeLists.txt
@@ -18,6 +18,5 @@ if(NOT LLVM_LIBC_FULL_BUILD)
   return()
 endif()
 
-add_subdirectory(config)
 add_subdirectory(integration)
 add_subdirectory(loader)
diff --git a/libc/test/config/CMakeLists.txt b/libc/test/config/CMakeLists.txt
diff --git a/libc/test/config/linux/CMakeLists.txt b/libc/test/config/linux/CMakeLists.txt
diff --git a/libc/test/config/linux/x86_64/CMakeLists.txt b/libc/test/config/linux/x86_64/CMakeLists.txt
diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
@@ -48,3 +48,5 @@ add_custom_command(TARGET libc_str_to_float_comparison_test
                    DEPENDS ${float_test_file}
                    COMMENT "Test the strtof and strtod implementations against precomputed results." 
                    VERBATIM)
+
+add_subdirectory(OSUtil)
diff --git a/libc/test/src/__support/OSUtil/CMakeLists.txt b/libc/test/src/__support/OSUtil/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_libc_testsuite(libc_osutil_tests)
+
+add_subdirectory(linux)
diff --git a/libc/test/src/__support/OSUtil/linux/CMakeLists.txt b/libc/test/src/__support/OSUtil/linux/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(x86_64)
diff --git a/libc/test/src/__support/OSUtil/linux/x86_64/CMakeLists.txt b/libc/test/src/__support/OSUtil/linux/x86_64/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_libc_unittest(
+  syscall_unittest
+  SUITE libc_osutil_tests
+  SRCS syscall_test.cpp
+  DEPENDS
+   libc.src.__support.OSUtil.osutil
+)
diff --git a/...test/config/linux/x86_64/syscall_test.cpp → ...port/OSUtil/linux/x86_64/syscall_test.cpp b/...test/config/linux/x86_64/syscall_test.cpp → ...port/OSUtil/linux/x86_64/syscall_test.cpp
@@ -6,10 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "config/linux/syscall.h"
-#include "utils/UnitTest/Test.h"
-
 #include "src/__support/CPP/Functional.h"
+#include "src/__support/OSUtil/syscall.h"
+#include "utils/UnitTest/Test.h"
 
 TEST(LlvmLibcX86_64_SyscallTest, APITest) {
   // We only do a signature test here. Actual functionality tests are
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		add_libc_testsuite(libc_osutil_tests)

		add_subdirectory(linux)