diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java b/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java
deleted file mode 100644
index da6411a80cb..00000000000
--- a/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*[INCLUDE-IF Sidecar18-SE-OpenJ9]*/
-
-/*******************************************************************************
- * Copyright (c) 2017, 2018 IBM Corp. and others
- *
- * This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License 2.0 which accompanies this
- * distribution and is available at https://www.eclipse.org/legal/epl-2.0/
- * or the Apache License, Version 2.0 which accompanies this distribution and
- * is available at https://www.apache.org/licenses/LICENSE-2.0.
- *
- * This Source Code may also be made available under the following
- * Secondary Licenses when the conditions for such availability set
- * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
- * General Public License, version 2 with the GNU Classpath
- * Exception [1] and GNU General Public License, version 2 with the
- * OpenJDK Assembly Exception [2].
- *
- * [1] https://www.gnu.org/software/classpath/license.html
- * [2] http://openjdk.java.net/legal/assembly-exception.html
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
- *******************************************************************************/
diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
deleted file mode 100644
index 5b3d184605d..00000000000
--- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*[INCLUDE-IF Sidecar18-SE-OpenJ9]*/
-
-/*******************************************************************************
- * Copyright (c) 2017, 2018 IBM Corp. and others
- *
- * This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License 2.0 which accompanies this
- * distribution and is available at https://www.eclipse.org/legal/epl-2.0/
- * or the Apache License, Version 2.0 which accompanies this distribution and
- * is available at https://www.apache.org/licenses/LICENSE-2.0.
- *
- * This Source Code may also be made available under the following
- * Secondary Licenses when the conditions for such availability set
- * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
- * General Public License, version 2 with the GNU Classpath
- * Exception [1] and GNU General Public License, version 2 with the
- * OpenJDK Assembly Exception [2].
- *
- * [1] https://www.gnu.org/software/classpath/license.html
- * [2] http://openjdk.java.net/legal/assembly-exception.html
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
- *******************************************************************************/
-/*[IF Java11]*/
-
-package java.lang.invoke;
-
-class MethodHandleNatives {
-
-	static LinkageError mapLookupExceptionToError(ReflectiveOperationException roe) {
-		String exMsg = roe.getMessage();
-		LinkageError linkageErr;
-		if (roe instanceof IllegalAccessException) {
-			linkageErr = new IllegalAccessError(exMsg);
-		} else if (roe instanceof NoSuchFieldException) {
-			linkageErr = new NoSuchFieldError(exMsg);
-		} else if (roe instanceof NoSuchMethodException) {
-			linkageErr = new NoSuchMethodError(exMsg);
-		} else {
-			linkageErr = new IncompatibleClassChangeError(exMsg);
-		}
-		Throwable th = roe.getCause();
-		linkageErr.initCause(th == null ? roe : th);
-		return linkageErr;
-	}
-}
-
-/*[ENDIF]*/
diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index eff857f0505..02f42628344 100644
--- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -1263,5 +1263,20 @@ private ClassDesc getArrayTypeClassDesc() {
 			return (ClassDesc)args[0];
 		}		
 	}
-/*[ENDIF] Java12 */ 
+/*[ENDIF] Java12 */
+
+	final class AccessDescriptor {
+		final MethodType symbolicMethodTypeErased;
+		final MethodType symbolicMethodTypeInvoker;
+		final Class<?> returnType;
+		final int type;
+		final int mode;
+		public AccessDescriptor(MethodType mtype, int type, int mode) {
+			symbolicMethodTypeErased = mtype.erase();
+			symbolicMethodTypeInvoker = mtype.insertParameterTypes(0, new Class<?>[] {VarHandle.class});
+			returnType = mtype.returnType();
+			this.type = type;
+			this.mode = mode;
+		}
+	}
 }