diff --git a/Makefile.am b/Makefile.am
index 25e1358..5042ec5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,22 @@
 noinst_HEADERS = \
 	occ_pass_through.hpp \
 	occ_status.hpp \
-	powercap.hpp
+	powercap.hpp \
+	occ_errors.hpp \
+	occ_events.hpp
 
 sbin_PROGRAMS = openpower-occ-control
 openpower_occ_control_SOURCES = \
 	occ_pass_through.cpp \
 	occ_status.cpp \
 	occ_device.cpp \
+	occ_errors.cpp \
 	app.cpp \
-	org/open_power/OCC/PassThrough/error.cpp \
-	powercap.cpp
+	powercap.cpp \
+	org/open_power/OCC/Device/error.cpp
 
-BUILT_SOURCES =  org/open_power/OCC/PassThrough/error.hpp \
-                 org/open_power/OCC/PassThrough/error.cpp
+BUILT_SOURCES =  org/open_power/OCC/Device/error.hpp \
+                 org/open_power/OCC/Device/error.cpp
 
 CLEANFILES = ${BUILT_SOURCES}
 
@@ -22,19 +25,21 @@
 	$(SDBUSPLUS_LIBS) \
 	$(PHOSPHOR_LOGGING_LIBS) \
 	$(OPENPOWER_DBUS_INTERFACES_LIBS) \
+	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
         -lstdc++fs
 
 openpower_occ_control_CXXFLAGS =
 	$(SDBUSPLUS_CFLAGS) \
 	$(PHOSPHOR_LOGGING_CFLAGS) \
-	$(OPENPOWER_DBUS_INTERFACES_CFLAGS)
+	$(OPENPOWER_DBUS_INTERFACES_CFLAGS) \
+	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
 
-org/open_power/OCC/PassThrough/error.hpp: ${top_srcdir}/org/open_power/OCC/PassThrough.errors.yaml
+org/open_power/OCC/Device/error.hpp: ${top_srcdir}/org/open_power/OCC/Device.errors.yaml
 	@mkdir -p `dirname $@`
-	$(SDBUSPLUSPLUS) -r $(top_srcdir) error exception-header org.open_power.OCC.PassThrough > $@
+	$(SDBUSPLUSPLUS) -r $(top_srcdir) error exception-header org.open_power.OCC.Device > $@
 
-org/open_power/OCC/PassThrough/error.cpp: ${top_srcdir}/org/open_power/OCC/PassThrough.errors.yaml
+org/open_power/OCC/Device/error.cpp: ${top_srcdir}/org/open_power/OCC/Device.errors.yaml
 	@mkdir -p `dirname $@`
-	$(SDBUSPLUSPLUS) -r $(top_srcdir) error exception-cpp org.open_power.OCC.PassThrough > $@
+	$(SDBUSPLUSPLUS) -r $(top_srcdir) error exception-cpp org.open_power.OCC.Device > $@
 
-SUBDIRS = . test
\ No newline at end of file
+SUBDIRS = . test