--- a/src/hotspot/share/runtime/vmStructs.cpp	Fri Mar 02 03:14:49 2018 -0500
+++ b/src/hotspot/share/runtime/vmStructs.cpp	Fri Mar 02 09:20:16 2018 +0100
@@ -138,8 +138,6 @@
 #include "runtime/vmStructs_trace.hpp"
 #endif
 
-#include "runtime/vmStructs_ext.hpp"
-
 #ifdef COMPILER2
 #include "opto/addnode.hpp"
 #include "opto/block.hpp"
@@ -3032,9 +3030,6 @@
                    GENERATE_STATIC_VM_STRUCT_ENTRY)
 #endif
 
-  VM_STRUCTS_EXT(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_STATIC_VM_STRUCT_ENTRY)
-
   VM_STRUCTS_OS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                 GENERATE_STATIC_VM_STRUCT_ENTRY,
                 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
@@ -3099,9 +3094,6 @@
               GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
 #endif
 
-  VM_TYPES_EXT(GENERATE_VM_TYPE_ENTRY,
-               GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
-
   VM_TYPES_OS(GENERATE_VM_TYPE_ENTRY,
               GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
               GENERATE_OOP_VM_TYPE_ENTRY,
@@ -3249,9 +3241,6 @@
                    CHECK_STATIC_VM_STRUCT_ENTRY);
 #endif
 
-  VM_STRUCTS_EXT(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_STATIC_VM_STRUCT_ENTRY);
-
   VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_STATIC_VM_STRUCT_ENTRY,
                  CHECK_NO_OP,
@@ -3299,9 +3288,6 @@
               CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
 #endif
 
-  VM_TYPES_EXT(CHECK_VM_TYPE_ENTRY,
-               CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
-
   VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
@@ -3373,9 +3359,6 @@
                            ENSURE_FIELD_TYPE_PRESENT));
 #endif
 
-  debug_only(VM_STRUCTS_EXT(ENSURE_FIELD_TYPE_PRESENT,
-                            ENSURE_FIELD_TYPE_PRESENT));
-
   debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
                             ENSURE_FIELD_TYPE_PRESENT,
                             CHECK_NO_OP,

--- a/src/hotspot/share/runtime/vmStructs_ext.hpp	Fri Mar 02 03:14:49 2018 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_RUNTIME_VMSTRUCTS_EXT_HPP
-#define SHARE_VM_RUNTIME_VMSTRUCTS_EXT_HPP
-
-#define VM_STRUCTS_EXT(a, b)
-
-#define VM_TYPES_EXT(a, b)
-
-
-#endif // SHARE_VM_RUNTIME_VMSTRUCTS_EXT_HPP