diff --git a/Makefile.am b/Makefile.am
index 5e03648..966dbe4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,9 @@
 libuserlayer_la_SOURCES = \
         user_channel/user_layer.cpp \
         user_channel/user_mgmt.cpp \
-        user_channel/passwd_mgr.cpp
+        user_channel/passwd_mgr.cpp \
+        user_channel/channel_mgmt.cpp \
+        user_channel/channel_layer.cpp
 
 libuserlayer_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) \
 	$(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -lstdc++fs \
@@ -99,6 +101,7 @@
 	read_fru_data.cpp \
 	sensordatahandler.cpp \
 	user_channel/usercommands.cpp \
+	user_channel/channelcommands.cpp \
 	$(libipmi20_BUILT_LIST)
 
 @CODE_COVERAGE_RULES@
@@ -138,6 +141,7 @@
 nobase_include_HEADERS = \
 	host-ipmid/iana.hpp \
 	user_channel/user_layer.hpp \
+	user_channel/channel_layer.hpp \
 	host-ipmid/ipmid-api.h \
 	host-ipmid/ipmid-host-cmd.hpp \
 	host-ipmid/ipmid-host-cmd-utils.hpp \