diff --git a/apps/date.cpp b/apps/date.cpp
index 17bde216..9f3d21b9 100644
--- a/apps/date.cpp
+++ b/apps/date.cpp
@@ -1,6 +1,5 @@
 #include <os/ArgumentParser.h>
 #include <os/File.h>
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/apps/init.cpp b/apps/init.cpp
index 132aebf0..521f92e3 100644
--- a/apps/init.cpp
+++ b/apps/init.cpp
@@ -1,12 +1,11 @@
+#include <errno.h>
+#include <fcntl.h>
 #include <luna/PathParser.h>
 #include <luna/String.h>
 #include <luna/Vector.h>
 #include <os/Directory.h>
 #include <os/File.h>
 #include <os/Process.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/apps/ls.cpp b/apps/ls.cpp
index 2da0c0d6..d5f5aeef 100644
--- a/apps/ls.cpp
+++ b/apps/ls.cpp
@@ -1,9 +1,8 @@
+#include <fcntl.h>
 #include <os/ArgumentParser.h>
 #include <os/Directory.h>
 #include <os/File.h>
 #include <os/FileSystem.h>
-
-#include <fcntl.h>
 #include <stdio.h>
 #include <sys/stat.h>
 
@@ -39,11 +38,13 @@ Result<int> luna_main(int argc, char** argv)
 
         files = TRY(dir->list(filter));
     }
-    else
+    else if (os::FileSystem::exists(pathname))
     {
         auto str = TRY(String::from_string_view(pathname));
         TRY(files.try_append(move(str)));
     }
+    else
+        return err(ENOENT);
 
     if (!long_list)
     {
diff --git a/apps/sh.cpp b/apps/sh.cpp
index f51a89fb..efed77f6 100644
--- a/apps/sh.cpp
+++ b/apps/sh.cpp
@@ -1,11 +1,10 @@
+#include <errno.h>
 #include <luna/String.h>
 #include <luna/Vector.h>
 #include <os/ArgumentParser.h>
 #include <os/File.h>
 #include <os/FileSystem.h>
 #include <os/Process.h>
-
-#include <errno.h>
 #include <pwd.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/libc/src/env.cpp b/libc/src/env.cpp
index 2139906c..0fdac72a 100644
--- a/libc/src/env.cpp
+++ b/libc/src/env.cpp
@@ -1,7 +1,6 @@
+#include <errno.h>
 #include <luna/ScopeGuard.h>
 #include <luna/Vector.h>
-
-#include <errno.h>
 #include <stdlib.h>
 
 extern "C" char** environ;
diff --git a/libc/src/stdio.cpp b/libc/src/stdio.cpp
index c0f66379..97cc3ad2 100644
--- a/libc/src/stdio.cpp
+++ b/libc/src/stdio.cpp
@@ -1,4 +1,3 @@
-#define _LUNA_SYSTEM_ERROR_EXTENSIONS
 #include <bits/errno-return.h>
 #include <fcntl.h>
 #include <luna/Format.h>
diff --git a/libc/src/stdlib.cpp b/libc/src/stdlib.cpp
index 362f1a15..6c62940d 100644
--- a/libc/src/stdlib.cpp
+++ b/libc/src/stdlib.cpp
@@ -1,4 +1,3 @@
-#define _LUNA_SYSTEM_ERROR_EXTENSIONS
 #include <errno.h>
 #include <limits.h>
 #include <luna/Heap.h>
diff --git a/libc/src/sys/mman.cpp b/libc/src/sys/mman.cpp
index df3f2a31..2ac4f3cc 100644
--- a/libc/src/sys/mman.cpp
+++ b/libc/src/sys/mman.cpp
@@ -1,4 +1,3 @@
-#define _LUNA_SYSTEM_ERROR_EXTENSIONS
 #include <bits/errno-return.h>
 #include <luna/Heap.h>
 #include <sys/mman.h>
diff --git a/libc/src/time.cpp b/libc/src/time.cpp
index 14db8a58..8224c7d4 100644
--- a/libc/src/time.cpp
+++ b/libc/src/time.cpp
@@ -1,4 +1,3 @@
-#define _LUNA_SYSTEM_ERROR_EXTENSIONS
 #include <bits/errno-return.h>
 #include <luna/Check.h>
 #include <luna/Format.h>
diff --git a/libc/src/unistd.cpp b/libc/src/unistd.cpp
index 352e420d..bd836555 100644
--- a/libc/src/unistd.cpp
+++ b/libc/src/unistd.cpp
@@ -1,8 +1,7 @@
-#include <luna/StringBuilder.h>
-#include <luna/Vector.h>
-
 #include <bits/errno-return.h>
 #include <fcntl.h>
+#include <luna/StringBuilder.h>
+#include <luna/Vector.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/libos/src/Directory.cpp b/libos/src/Directory.cpp
index bd0dfc2f..03faebc0 100644
--- a/libos/src/Directory.cpp
+++ b/libos/src/Directory.cpp
@@ -1,8 +1,7 @@
-#include <luna/CString.h>
-#include <os/Directory.h>
-
 #include <errno.h>
 #include <fcntl.h>
+#include <luna/CString.h>
+#include <os/Directory.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
diff --git a/libos/src/FileSystem.cpp b/libos/src/FileSystem.cpp
index e7c7400f..8a1e35fb 100644
--- a/libos/src/FileSystem.cpp
+++ b/libos/src/FileSystem.cpp
@@ -1,10 +1,9 @@
-#include <luna/String.h>
-#include <os/Directory.h>
-#include <os/FileSystem.h>
-
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <luna/String.h>
+#include <os/Directory.h>
+#include <os/FileSystem.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
diff --git a/libos/src/Main.cpp b/libos/src/Main.cpp
index c14548ed..9059c295 100644
--- a/libos/src/Main.cpp
+++ b/libos/src/Main.cpp
@@ -1,6 +1,5 @@
-#include <os/Main.h>
-
 #include <errno.h>
+#include <os/Main.h>
 #include <stdio.h>
 
 int g_argc;
diff --git a/libos/src/Process.cpp b/libos/src/Process.cpp
index 9ce8128f..86d4227c 100644
--- a/libos/src/Process.cpp
+++ b/libos/src/Process.cpp
@@ -1,6 +1,5 @@
-#include <os/Process.h>
-
 #include <errno.h>
+#include <os/Process.h>
 #include <sys/syscall.h>
 #include <unistd.h>