diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index b5c7d6e8a8..0dcb706f2a 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -23,6 +23,7 @@
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/dlx.h"
+#include "elf32-dlx.h"
 
 #define USE_REL 1
 
@@ -40,8 +41,6 @@
 
 static int skip_dlx_elf_hi16_reloc = 0;
 
-extern int set_dlx_skip_hi16_flag (int);
-
 int
 set_dlx_skip_hi16_flag (int flag)
 {
diff --git a/bfd/elf32-dlx.h b/bfd/elf32-dlx.h
new file mode 100644
index 0000000000..f2cdd1215d
--- /dev/null
+++ b/bfd/elf32-dlx.h
@@ -0,0 +1,34 @@
+/* DLX specific support for 32-bit ELF
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF32_DLX_H
+#define _ELF32_DLX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int set_dlx_skip_hi16_flag (int);
+
+#ifdef __cplusplus
+     }
+#endif
+
+#endif /* _ELF32_DLX_H */
diff --git a/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
index 03e8de9ea2..079a9b6ae9 100644
--- a/gas/config/tc-dlx.c
+++ b/gas/config/tc-dlx.c
@@ -24,6 +24,8 @@
 #include "safe-ctype.h"
 #include "tc-dlx.h"
 #include "opcode/dlx.h"
+#include "elf/dlx.h"
+#include "bfd/elf32-dlx.h"
 
 /* Make it easier to clone this machine desc into another one.  */
 #define	machine_opcode      dlx_opcode
diff --git a/gas/config/tc-dlx.h b/gas/config/tc-dlx.h
index aa1b1575f5..8da1c11f76 100644
--- a/gas/config/tc-dlx.h
+++ b/gas/config/tc-dlx.h
@@ -32,7 +32,6 @@
 #define LEX_DOLLAR 1
 
 extern void dlx_pop_insert         (void);
-extern int set_dlx_skip_hi16_flag  (int);
 extern int dlx_unrecognized_line   (int);
 extern bfd_boolean md_dlx_fix_adjustable  (struct fix *);