diff --git a/src/mainboard/intel/mohonpeak/irqroute.h b/src/mainboard/intel/mohonpeak/irqroute.h
index 0e71a88fbb..cbd320a130 100644
--- a/src/mainboard/intel/mohonpeak/irqroute.h
+++ b/src/mainboard/intel/mohonpeak/irqroute.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef IRQROUTE_H
+#define IRQROUTE_H
+
 #include <southbridge/intel/fsp_rangeley/irq.h>
 #include <southbridge/intel/fsp_rangeley/pci_devs.h>
 
@@ -66,3 +69,5 @@
 	PIRQ_PIC(F, 15), \
 	PIRQ_PIC(G, 14), \
 	PIRQ_PIC(H, 15)
+
+#endif /* IRQROUTE_H */
\ No newline at end of file
diff --git a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
index 4a298d3bfe..49aca6ecec 100644
--- a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
+++ b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/*
+ * This file intentionally gets included multiple times, to set pic and apic
+ * modes, so should not have guard statements added.
+ */
+
 /*
  * This file will use irqroute.asl and mainboard/irqroute.h
  * to generate the ACPI IRQ routing for the mainboard being compiled.
@@ -29,6 +34,7 @@
 #undef PCI_DEV_PIRQ_ROUTE
 #undef PIRQ_PIC_ROUTES
 #undef PIRQ_PIC
+#undef IRQROUTE_H
 
 #if defined(PIC_MODE)