diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch
index 522ad5e4..6d84cfb4 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch
@@ -26,7 +26,7 @@ index 2df7420..10f496b 100644
  #endif
 
 -#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc)
-+#include "linux/rpmsg_rpc.h"
++#include "rpmsg_rpc.h"
 
  #ifdef _linux_
  #define linux _linux
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
index 11be09ea..e12ce273 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
@@ -18,8 +18,6 @@ SRC_URI += "file://tiipclad-daemon.sh \
             file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \
            "
 
-CFLAGS += "-I${UNPACKDIR}"
-
 DAEMON = "UNKNOWN"
 DAEMON:dra7xx = "lad_dra7xx"
 DAEMON:omapl138 = "lad_omapl138"
@@ -40,6 +38,10 @@ do_configure() {
     oe_runconf
 }
 
+do_compile:prepend() {
+    cp ${UNPACKDIR}/linux/rpmsg_rpc.h ${S}/packages/ti/ipc/mm/rpmsg_rpc.h
+}
+
 do_install:append() {
     install -d ${D}${sysconfdir}/init.d/