diff --git a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
deleted file mode 100644
index 122594e..0000000
--- a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- /dev/null	2017-01-17 09:45:47.987442339 +1030
-+++ include/linux/aspeed-lpc-ctrl.h	2017-01-17 11:12:17.711635876 +1030
-@@ -0,0 +1,36 @@
-+/*
-+ * Copyright 2017 IBM Corp.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifndef _LINUX_ASPEED_LPC_CTRL_H
-+#define _LINUX_ASPEED_LPC_CTRL_H
-+
-+#include <linux/ioctl.h>
-+
-+/* Window types */
-+#define ASPEED_LPC_CTRL_WINDOW_FLASH	1
-+#define ASPEED_LPC_CTRL_WINDOW_MEMORY	2
-+
-+struct aspeed_lpc_ctrl_mapping {
-+	__u8    window_type;
-+	__u8    window_id;
-+	__u16   flags;
-+	__u32   addr;
-+	__u32   offset;
-+	__u32   size;
-+};
-+
-+#define __ASPEED_LPC_CTRL_IOCTL_MAGIC	0xb2
-+
-+#define ASPEED_LPC_CTRL_IOCTL_GET_SIZE	_IOWR(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \
-+		0x00, struct aspeed_lpc_ctrl_mapping)
-+
-+#define ASPEED_LPC_CTRL_IOCTL_MAP	_IOW(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \
-+		0x01, struct aspeed_lpc_ctrl_mapping)
-+
-+#endif /* _LINUX_ASPEED_LPC_CTRL_H */
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
index b33df92..b5ee156 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
@@ -17,7 +17,6 @@
 SRC_URI += "git://github.com/openbmc/mboxbridge.git"
 
 SRC_URI += "file://99-aspeed-lpc-ctrl.rules"
-SRC_URI += "file://aspeed-lpc-ctrl-h.patch"
 
 SRCREV="0acc669979cc5b1b66c2c4e5d975c60779bedd81"
 
@@ -26,10 +25,6 @@
 MBOXD_FLASH_SIZE ??= "32M"
 SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service"
 
-# Hacks because ${STAGING_KERNEL_DIR} points to the kernel source tree, not the
-# installed, pre-processed headers. Requires the aspeed-lpc-ctrl-h patch above.
-CFLAGS_append = " -I include"
-
 do_install_append() {
     install -d ${D}/lib/udev/rules.d
     install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d