diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a137560c1b..1644ac364f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-21  John Baldwin  <jhb@FreeBSD.org>
+
+	* arch/aarch64.c: Include "common-defs.h".
+	* arch/amd64.c: Likewise.
+	* arch/i386.c: Likewise.
+
 2018-02-21  Tom Tromey  <tom@tromey.com>
 
 	* value.h: (extract_field_op): Update.
diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c
index c49d710312..b85e460b6b 100644
--- a/gdb/arch/aarch64.c
+++ b/gdb/arch/aarch64.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
+#include "common-defs.h"
 #include "aarch64.h"
 #include <stdlib.h>
 
diff --git a/gdb/arch/amd64.c b/gdb/arch/amd64.c
index bd3df8b91d..d31d8f1f75 100644
--- a/gdb/arch/amd64.c
+++ b/gdb/arch/amd64.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "common-defs.h"
 #include "amd64.h"
 #include "x86-xstate.h"
 #include <stdlib.h>
diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c
index d3e1eb90e0..82e9b118bd 100644
--- a/gdb/arch/i386.c
+++ b/gdb/arch/i386.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "common-defs.h"
 #include "i386.h"
 #include "tdesc.h"
 #include "x86-xstate.h"