diff --git a/libc/Makefile b/libc/Makefile
index 1f3121fd..6979b309 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -168,7 +168,6 @@ arpa/inet/inet_addr.o \
 arpa/inet/inet_ntoa.o \
 arpa/inet/inet_ntop.o \
 arpa/inet/inet_pton.o \
-basename.o \
 calltrace.o \
 canonicalize_file_name_at.o \
 canonicalize_file_name.o \
@@ -186,7 +185,6 @@ $(CPUDIR)/syscall.o \
 creat.o \
 dirent/fddir-sortix.o \
 dirent/scandir.o \
-dirname.o \
 dispmsg_issue.o \
 dlfcn.o \
 dup2.o \
@@ -257,6 +255,8 @@ isatty.o \
 kernelinfo.o \
 kill.o \
 lchown.o \
+libgen/basename.o \
+libgen/dirname.o \
 linkat.o \
 link.o \
 localeconv.o \
diff --git a/libc/basename.cpp b/libc/libgen/basename.cpp
similarity index 98%
rename from libc/basename.cpp
rename to libc/libgen/basename.cpp
index f3c813d9..6e47a07e 100644
--- a/libc/basename.cpp
+++ b/libc/libgen/basename.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    basename.cpp
+    libgen/basename.cpp
     Returns the name part of a path.
 
 *******************************************************************************/
diff --git a/libc/dirname.cpp b/libc/libgen/dirname.cpp
similarity index 98%
rename from libc/dirname.cpp
rename to libc/libgen/dirname.cpp
index a1ace1ec..55a6547e 100644
--- a/libc/dirname.cpp
+++ b/libc/libgen/dirname.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    dirname.cpp
+    libgen/dirname.cpp
     Returns the directory part of a path.
 
 *******************************************************************************/