diff --git a/Makefile.am b/Makefile.am
index e70b061..56a3b57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,9 @@
 	write.hpp \
 	impl.hpp \
 	args.hpp \
-	types.hpp \
-	utils.hpp
+	utils.hpp \
+        keyword_vpd_parser.hpp \
+	ibm_vpd_type_check.hpp
 
 if IBM_PARSER
 noinst_HEADERS += \
@@ -17,12 +18,14 @@
 
 bin_PROGRAMS = ibm-read-vpd
 ibm_read_vpd_SOURCES = \
-	ipz_app.cpp \
+	ibm_vpd_app.cpp \
+	ibm_vpd_type_check.cpp \
 	parser.cpp \
 	vpdecc/vpdecc.c   \
 	vpdecc/vpdecc_support.c\
 	impl.cpp \
-	utils.cpp
+	utils.cpp \
+        keyword_vpd_parser.cpp
 
 ibm_read_vpd_LDFLAGS = $(SDBUSPLUS_LIBS) $(PHOSPHOR_LOGGING_LIBS)
 ibm_read_vpd_CXXFLAGS = $(SDBUSPLUS_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS)