diff --git a/Makefile.am b/Makefile.am
index db7bedf..ff964e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,8 @@
 
 if OEM_IBM
 pldmd_CXXFLAGS += \
-        -I$(top_builddir)/oem/ibm/
+	-I$(top_srcdir)/oem/ibm/ \
+	-I$(top_srcdir)/libpldm
 endif
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/libpldm/Makefile.am b/libpldm/Makefile.am
index dc03711..3de7bf3 100644
--- a/libpldm/Makefile.am
+++ b/libpldm/Makefile.am
@@ -13,16 +13,17 @@
 	platform.c \
 	bios.c
 
+libpldm_la_LDFLAGS = -version-info 1:0:0 -shared
+libpldm_la_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+libpldm_la_LIBADD = $(CODE_COVERAGE_LIBS)
+
 if OEM_IBM
 libpldm_include_HEADERS += \
         $(top_builddir)/oem/ibm/libpldm/file_io.h
 libpldm_la_SOURCES += \
         $(top_builddir)/oem/ibm/libpldm/file_io.c
+libpldm_la_CFLAGS += -I$(top_srcdir)/libpldm
 endif
 
-libpldm_la_LDFLAGS = -version-info 1:0:0 -shared
-libpldm_la_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-libpldm_la_LIBADD = $(CODE_COVERAGE_LIBS)
-
 pkgconfiglibdir = ${libdir}/pkgconfig
 pkgconfiglib_DATA = libpldm.pc
diff --git a/libpldmresponder/Makefile.am b/libpldmresponder/Makefile.am
index c40b749..9113b3a 100644
--- a/libpldmresponder/Makefile.am
+++ b/libpldmresponder/Makefile.am
@@ -23,14 +23,12 @@
 
 libpldmresponder_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CPPFLAGS) \
-	-I$(top_builddir)/libpldm/ \
 	-I$(top_srcdir)
 
 if OEM_IBM
 libpldmresponder_la_SOURCES += \
     $(top_builddir)/oem/ibm/libpldmresponder/file_io.cpp \
     $(top_builddir)/oem/ibm/libpldmresponder/file_table.cpp
-libpldmresponder_la_CPPFLAGS += \
-        -I$(top_builddir)/oem/ibm/
+libpldmresponder_la_CPPFLAGS += -I$(top_srcdir)/libpldm
 endif
 
diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index 2e08745..6025fd7 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "libpldm/base.h"
-#include "libpldm/file_io.h"
+#include "oem/ibm/libpldm/file_io.h"
 
 namespace pldm
 {