diff --git a/gnu/dist/toolchain/gcc/config/vax/netbsd-elf.h b/gnu/dist/toolchain/gcc/config/vax/netbsd-elf.h
index f314c5fdbab1..d9a25399e80c 100644
--- a/gnu/dist/toolchain/gcc/config/vax/netbsd-elf.h
+++ b/gnu/dist/toolchain/gcc/config/vax/netbsd-elf.h
@@ -24,10 +24,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Get generic NetBSD ELF definitions.  We will override these if necessary. */
 
-#include <elfos.h>
 #define NETBSD_ELF
-#include <netbsd.h>
-#include <vax/netbsd.h>
+#include "vax/netbsd.h"
 
 #undef SIZE_TYPE
 #define SIZE_TYPE "long unsigned int"
diff --git a/gnu/dist/toolchain/gcc/config/vax/netbsd.h b/gnu/dist/toolchain/gcc/config/vax/netbsd.h
index 8bca499ac755..1c27943d7a2d 100644
--- a/gnu/dist/toolchain/gcc/config/vax/netbsd.h
+++ b/gnu/dist/toolchain/gcc/config/vax/netbsd.h
@@ -1,3 +1,9 @@
+#include <vax/vax.h>
+#ifdef NETBSD_ELF
+#include <elfos.h>
+#endif
+#include <netbsd.h>
+
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__vax__ -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(vax) -Amachine(vax)"
 
@@ -82,3 +88,4 @@ while (0)
 }
 
 /* Use sjlj exceptions. */
+
diff --git a/gnu/dist/toolchain/gcc/configure b/gnu/dist/toolchain/gcc/configure
index e1bcc30c79b2..cec9ebe84682 100755
--- a/gnu/dist/toolchain/gcc/configure
+++ b/gnu/dist/toolchain/gcc/configure
@@ -5588,14 +5588,10 @@ for machine in $build $host $target; do
 		xm_defines=USG
 		float_format=vax
 		;;
-	vax-*-netbsdelf*)
+	vax-*-netbsd*)
 		float_format=vax
 		gas=yes gnu_ld=yes
 		;;
-	vax-*-netbsd*)
-		tm_file="${tm_file} netbsd.h vax/netbsd.h"
-		float_format=vax
-		;;
 	vax-*-openbsd*)
 		tmake_file="${tmake_file} vax/t-openbsd"
 		;;
diff --git a/gnu/dist/toolchain/gcc/configure.in b/gnu/dist/toolchain/gcc/configure.in
index d58cbd9eea36..19294c00d782 100644
--- a/gnu/dist/toolchain/gcc/configure.in
+++ b/gnu/dist/toolchain/gcc/configure.in
@@ -3286,14 +3286,10 @@ changequote([,])dnl
 		xm_defines=USG
 		float_format=vax
 		;;
-	vax-*-netbsdelf*)
+	vax-*-netbsd*)
 		float_format=vax
 		gas=yes gnu_ld=yes
 		;;
-	vax-*-netbsd*)
-		tm_file="${tm_file} netbsd.h vax/netbsd.h"
-		float_format=vax
-		;;
 	vax-*-openbsd*)
 		tmake_file="${tmake_file} vax/t-openbsd"
 		;;