diff --git a/src/Makefile b/src/Makefile
index ce0192abd38..d894b14aeae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -178,8 +178,7 @@ endif
 SUBDIRS := \
     libposemath \
     \
-    libnml/linklist libnml/cms libnml/rcs libnml/os_intf \
-    libnml/nml libnml/buffer libnml \
+    libnml \
     \
     rtapi/examples/timer rtapi/examples/semaphore rtapi/examples/shmem \
     rtapi/examples/extint rtapi/examples/fifo rtapi/examples rtapi \
@@ -193,7 +192,7 @@ SUBDIRS := \
 	hal/user_comps/xhc-whb04b-6 \
     \
     $(GUI_SUBDIRS) \
-    emc/usr_intf/axis emc/usr_intf emc/nml_intf emc/task emc/kinematics emc/tp emc/canterp \
+    emc/usr_intf/axis emc/usr_intf emc/nml_intf emc/task emc/kinematics emc/canterp \
     emc/ini emc/rs274ngc emc/sai emc/pythonplugin \
     emc/motion-logger \
     emc/tooldata \
diff --git a/src/emc/tp/Submakefile b/src/emc/tp/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/buffer/Submakefile b/src/libnml/buffer/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/cms/Submakefile b/src/libnml/cms/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/linklist/Submakefile b/src/libnml/linklist/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/nml/Submakefile b/src/libnml/nml/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/os_intf/Submakefile b/src/libnml/os_intf/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/libnml/rcs/Submakefile b/src/libnml/rcs/Submakefile
deleted file mode 100644
index e69de29bb2d..00000000000