diff --git a/Makefile.am b/Makefile.am
index 20af6ed..bb7bdbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,6 +95,7 @@
 	ipmi_fru_info_area.cpp \
 	read_fru_data.cpp \
 	sensordatahandler.cpp \
+	user_channel/channelcommands.cpp \
 	$(libipmi20_BUILT_LIST)
 
 @CODE_COVERAGE_RULES@
@@ -106,8 +107,7 @@
 
 libipmi20_la_LIBADD = \
 	libipmid/libipmid.la \
-	user_channel/libchannellayer.la \
-	user_channel/libuserlayer.la
+	user_channel/libchannellayer.la
 libipmi20_la_LDFLAGS = \
 	$(SYSTEMD_LIBS) \
 	$(libmapper_LIBS) \
@@ -122,15 +122,12 @@
 	libipmid/libipmid.la \
 	user_channel/libuserlayer.la
 libusercmds_la_SOURCES = \
-	user_channel/usercommands.cpp \
-	user_channel/channelcommands.cpp
+	user_channel/usercommands.cpp
 libusercmds_la_LDFLAGS = \
 	$(PHOSPHOR_LOGGING_LIBS) \
 	$(LIBS) \
 	-version-info 0:0:0 -shared
-libusercmds_la_CXXFLAGS = \
-	$(PHOSPHOR_LOGGING_CFLAGS) \
-	-flto
+libusercmds_la_CXXFLAGS = $(COMMON_CXX)
 
 providers_LTLIBRARIES += libsysintfcmds.la
 libsysintfcmds_la_LIBADD = \
diff --git a/user_channel/Makefile.am b/user_channel/Makefile.am
index e57f4ad..5ec2104 100644
--- a/user_channel/Makefile.am
+++ b/user_channel/Makefile.am
@@ -14,9 +14,7 @@
 libuserlayer_la_SOURCES = \
 	user_layer.cpp \
 	user_mgmt.cpp \
-	passwd_mgr.cpp \
-	channel_mgmt.cpp \
-	channel_layer.cpp
+	passwd_mgr.cpp
 libuserlayer_la_LDFLAGS = \
 	$(SYSTEMD_LIBS) \
 	$(libmapper_LIBS) \
@@ -29,7 +27,9 @@
 	-I$(top_srcdir) \
 	$(COMMON_CXX)
 
-libchannellayer_la_SOURCES =
+libchannellayer_la_SOURCES = \
+	channel_mgmt.cpp \
+	channel_layer.cpp
 libchannellayer_la_LDFLAGS = \
 	$(SYSTEMD_LIBS) \
 	$(libmapper_LIBS) \