diff --git a/arch/arm/src/tiva/lm/lm3s_gpio.h b/arch/arm/src/tiva/lm/lm3s_gpio.h
index 19ab6b47f0..ca654a3bc7 100644
--- a/arch/arm/src/tiva/lm/lm3s_gpio.h
+++ b/arch/arm/src/tiva/lm/lm3s_gpio.h
@@ -44,6 +44,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <arch/tiva/chip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/lm/lm4f_gpio.h b/arch/arm/src/tiva/lm/lm4f_gpio.h
index 150ab02bb5..90822d9516 100644
--- a/arch/arm/src/tiva/lm/lm4f_gpio.h
+++ b/arch/arm/src/tiva/lm/lm4f_gpio.h
@@ -44,6 +44,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <arch/tiva/chip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index c4ea269360..c36fe67eda 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * arch/arm/src/tiva/tiva_gpio.h
  *
- *   Copyright (C) 2009-2010, 2013-2015, 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2010, 2013-2015, 2017-2018 Gregory Nutt. All rights
+ *     reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * With modifications from Calvin Maguranis <calvin.maguranis@trd2inc.com>
@@ -48,6 +49,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include <nuttx/irq.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/arm/src/tiva/tm4c/tm4c_gpio.h b/arch/arm/src/tiva/tm4c/tm4c_gpio.h
index 772a993cd1..be725d7a6c 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_gpio.h
+++ b/arch/arm/src/tiva/tm4c/tm4c_gpio.h
@@ -44,6 +44,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <arch/tiva/chip.h>
 
 /****************************************************************************
  * Pre-processor Definitions