diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index c1a34d39bb0..5c094a69730 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -86,7 +86,7 @@ ADD_OBJ_FILES = \
 		lib/credentials.o
 REQUIRED_SUBSYSTEMS = \
 		LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-		SOCKET_WRAPPER
+		SOCKET_WRAPPER CONFIG
 # End SUBSYSTEM LIBBASIC
 ##############################
 
diff --git a/source/lib/com/config.mk b/source/lib/com/config.mk
index a4fe891864b..4c0377795ca 100644
--- a/source/lib/com/config.mk
+++ b/source/lib/com/config.mk
@@ -1,21 +1,17 @@
-[SUBSYSTEM::LIBCOM]
+[SUBSYSTEM::COM]
 INIT_OBJ_FILES = \
 		lib/com/tables.o \
 		lib/com/rot.o \
 		lib/com/main.o
 
-################################################
-# Start SUBSYSTEM LIBDCOM
-[SUBSYSTEM::LIBDCOM]
+[SUBSYSTEM::DCOM]
 INIT_OBJ_FILES = \
 		lib/com/dcom/main.o \
 		lib/com/dcom/tables.o
-REQUIRED_SUBSYSTEMS = LIBCOM DCOM_PROXY_DCOM RPC_NDR_REMACT \
+REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
 					  RPC_NDR_OXIDRESOLVER
-# End SUBSYSTEM LIBDCOM
-################################################
 
 [MODULE::com_simple]
-SUBSYSTEM = LIBCOM
+SUBSYSTEM = COM
 INIT_OBJ_FILES = lib/com/classes/simple.o
 INIT_FUNCTION = com_simple_init
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index 2c8217afd74..0ee9c0f5012 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -9,7 +9,7 @@ ADD_OBJ_FILES = \
 		librpc/ndr/ndr_compression.o \
 		librpc/ndr/ndr_obfuscate.o \
 		librpc/ndr/ndr_misc.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBCOMPRESSION
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBCOMPRESSION LIBTALLOC LIBBASIC
 # End SUBSYSTEM NDR_RAW
 ################################################
 
diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index e9abd726e49..74483c93621 100644
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -24,9 +24,7 @@ INIT_OBJ_FILES = \
 		librpc/gen_ndr/ndr_dcom_d.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON \
-		NDR_OXIDRESOLVER \
-		NDR_REMACT \
-		LIBCOM
+		DCOM \
 # End MODULE dcerpc_dcom
 ################################################
 
diff --git a/source/torture/config.mk b/source/torture/config.mk
index 7b8ebe3e100..ca1b09eb057 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -63,7 +63,7 @@ REQUIRED_SUBSYSTEMS = \
 ADD_OBJ_FILES = \
 		torture/com/simple.o
 REQUIRED_SUBSYSTEMS = \
-		LIBCOM LIBDCOM
+		COM DCOM
 # End SUBSYSTEM TORTURE_COM
 #################################