diff --git a/openjdk.test.modularity/build.xml b/openjdk.test.modularity/build.xml
index dd087145..633d23dd 100644
--- a/openjdk.test.modularity/build.xml
+++ b/openjdk.test.modularity/build.xml
@@ -64,7 +64,7 @@ limitations under the License.
 		<path path="${openjdk_test_modularity_bin_dir}/common-mods" />
 	</path>
 
-	<target name="build" depends="build-no-natives, build-natives">
+	<target name="build" depends="build-no-natives">
 	</target>
 
 	<target name="check-compiler-level">
@@ -95,7 +95,7 @@ limitations under the License.
 		<echo message="can_build_modularity_natives_windows is ${can_build_modularity_natives_windows}"/>
 	</target>
 	
-	<target name="build-no-natives" depends="check-prereqs, check-compiler-level, build-java, build-javah">
+	<target name="build-no-natives" depends="check-prereqs, check-compiler-level, build-java">
 	</target>
 
 	<target name="build-java" depends="check-prereqs, create-bin-dir" if="${can_build_modularity}">
@@ -189,11 +189,6 @@ limitations under the License.
 		        includes="**/*.properties" />
 		</copy>
 		
-		<copy todir="${openjdk_test_modularity_bin_dir}/tests/com.test.jlink/conf">
-			<fileset dir="${openjdk_test_modularity_src_dir}/tests/com.test.jlink/conf"
-				includes="**/*.properties" />
-		</copy>
-
 		<apply executable="${java_compiler}" failonerror="true" parallel="true">
 			<arg value="-d" />
 			<arg value="${openjdk_test_modularity_bin_dir}/common" />
@@ -266,55 +261,6 @@ limitations under the License.
 		<echo message="openjdk_test_modularity_javac_did_not_run is ${openjdk_test_modularity_javac_did_not_run}" />
 	</target>
 	
-	<target name="build-javah" depends="check-prereqs, check-if-javac_ran" unless="javac_did_not_run">
-		<!-- Build JNI header files. -->
-		<!--From Java10, the 'javah' executable has been replaced with 'javac with options'. -->
-		
-		<property name="openjdk_test_modularity_javah_src" value="${openjdk_test_modularity_src_dir}/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java"/>
-		<property name="openjdk_test_modularity_headerdir" value="${openjdk_test_modularity_jlink_nativedir}/lib"/>
-		<mkdir dir="${openjdk_test_modularity_headerdir}" />
-		 
-		<!-- First delete the header file -->
-		<delete includeemptydirs="true" verbose="true">
-			<fileset dir="${openjdk_test_modularity_headerdir}" includes="adoptopenjdk_test_modularity_jlink_JniTest.h"/>
-		</delete>
-		
-		<!-- Then recreate it -->
-		<echo message="Building JNI header file for JniTest to ${openjdk_test_modularity_headerdir}" />
-		<exec executable="${java_compiler}" failonerror="true">
-			<arg value="-classpath"/>
-			<arg pathref="jlink.project.class.path" />
-			<arg value="-h"/>
-			<arg value="${openjdk_test_modularity_headerdir}"/>
-			<arg value="-d"/>
-			<arg value="${openjdk_test_modularity_bin_dir}"/>
-			<arg value="${openjdk_test_modularity_javah_src}"/>
-		</exec>
-	</target>
-	
-	<target name="build-natives" depends="check-prereqs, check-compiler-level, setup-native-build-command, build-natives-windows, build-natives-unix">
-	</target>
-	
-	<target name="setup-native-build-command" if="${can_build_modularity}">
-		<echo message="building natives for java_platform ${java_platform}"/>
-		<property name="openjdk_test_modularity_native_build_command" value='${setup_windows_build_env}${MAKE} -C ${openjdk_test_modularity_jlink_testcase_src}/native SRC=${openjdk_test_modularity_native_src} JAVA_HOME=${java_home} OUTDIR=${openjdk_test_modularity_jlink_outdir} HEADERDIR=${openjdk_test_modularity_jlink_headerdir} OSNAME=${java_osname}'/>
-		<tempfile property="openjdk_test_modularity_native_build_command_file" destDir="${java.io.tmpdir}" prefix="openjdk.build.command."/>
-	</target>
-
-	<target name="build-natives-windows" if="${can_build_modularity_natives_windows}">
-		<echo message="${openjdk_test_modularity_native_build_command}" file="${openjdk_test_modularity_native_build_command_file}.bat"/>
-		<exec executable="${openjdk_test_modularity_native_build_command_file}.bat" failonerror="true"/>
-		<delete file="${openjdk_test_modularity_native_build_command_file}.bat" verbose="true"/>
-	</target>
-
-	<target name="build-natives-unix" if="${can_build_modularity_natives_unix}">
-		<echo message="${openjdk_test_modularity_native_build_command}" file="${openjdk_test_modularity_native_build_command_file}.sh"/>
-		<exec executable="/bin/sh" failonerror="true">
-			<arg value="${openjdk_test_modularity_native_build_command_file}.sh"/>
-		</exec>
-		<delete file="${openjdk_test_modularity_native_build_command_file}.sh" verbose="true"/>
-	</target>
-
 	<target name="clean">
 		<delete dir="${openjdk_test_modularity_bin_dir}"/>
 	</target>
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestCompress.java b/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestCompress.java
deleted file mode 100644
index 31c6a97b..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestCompress.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-package adoptopenjdk.test.modularity.jlink;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.Properties;
-
-import adoptopenjdk.test.modularity.hello.*;
-
-public class JlinkPluginTestCompress
-{
-	@Test
-	public void testCompress() throws Exception
-	{		
-		File modBefore = new File(System.getProperty("modpath.before"));
-		File modAfter = new File(System.getProperty("modpath.after"));
-		
-		assertNotNull(modBefore);
-		assertNotNull(modAfter);
-		
-		double sizeBefore = modBefore.length();
-		double sizeAfter = modAfter.length();
-		
-		System.out.println("Modules Size before : " + (sizeBefore / 1024) + " KB");
-		System.out.println("Modules Size after  : " + (sizeAfter / 1024)  + " KB");
-		
-		assertTrue (sizeBefore > sizeAfter);
-	}
-	
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestExcludeNatives.java b/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestExcludeNatives.java
deleted file mode 100644
index 1c9f75d8..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestExcludeNatives.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-package adoptopenjdk.test.modularity.jlink;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.Properties;
-
-import net.adoptopenjdk.stf.StfException;
-
-public class JlinkPluginTestExcludeNatives
-{
-	@Test
-	public void testNativeExecutebleExists() throws Exception
-	{		
-       String javaExecFileName = "java";
-	   if (System.getProperty("platform").contains("win_x86")) {
-	      javaExecFileName = javaExecFileName + ".exe";
-	   }
-		  
-	   assertFalse("--strip-native-command option was used in jlink, "
-		  		+ "but native executables still exist in image directory.", 
-		  		new File(System.getProperty("image.bindir") + 
-		  				System.getProperty("file.separator") + javaExecFileName).exists());
-	}
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestReleaseInfo.java b/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestReleaseInfo.java
deleted file mode 100644
index 1785a90f..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestReleaseInfo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-package adoptopenjdk.test.modularity.jlink;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import org.junit.internal.runners.statements.Fail;
-
-import java.io.*;
-import java.util.Properties;
-
-import net.adoptopenjdk.stf.StfException;
-
-public class JlinkPluginTestReleaseInfo
-{
-	@Test
-	public void testReleaseInfo() throws Exception
-	{		
-		Properties releaseInfo = new Properties();
-		releaseInfo.load(new FileInputStream(System.getProperty("release.info.file")));
-
-		boolean releaseInfoAppended = false; 
-
-		Object value = releaseInfo.get("UseYour");
-		if (value != null) {
-			if (((String)value).equals("Illusion")) {
-				releaseInfoAppended = true;
-			}
-		}
-
-		assertTrue("Release info (key,value) pair was not appended to release file of "
-					+ "the runtime image", releaseInfoAppended);
-	}
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java b/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java
deleted file mode 100644
index d5c414f0..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-package adoptopenjdk.test.modularity.jlink;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import java.util.Random;
-
-
-public class JniTest
-{
-	static {System.loadLibrary("JniTest");}
-	
-	native static boolean pass(boolean b); // Expects the same result out as is passed in
-	native static boolean turn(boolean b); // Expects the opposite result out as is passed in
-
-	Random rand = new Random(System.currentTimeMillis());
-	
-	@Test
-	public void testBoolean() throws Exception	// Randomly passes or turns the variables both externally and internally then checks if they are the same  
-	{
-		for(int i=0; i<1000; i++)
-		{
-			boolean tempValue = rand.nextBoolean();
-			if (rand.nextBoolean())
-				assertEquals(tempValue, pass(tempValue));
-			else
-				assertEquals(!tempValue, turn(tempValue));
-		}
-	}
-	
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/PropertyReadTest.java b/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/PropertyReadTest.java
deleted file mode 100644
index fe8c0c3b..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/PropertyReadTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-package adoptopenjdk.test.modularity.jlink;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.Properties;
-
-import adoptopenjdk.test.modularity.hello.*;
-
-public class PropertyReadTest {
-	@Test
-	public void testPropertyFileRead() throws Exception {		
-		Properties prop = new Properties();	
-		prop.load(this.getClass().getModule().getResourceAsStream("conf/sample.properties"));
-		assertEquals(Hello.name(),prop.getProperty("word"));
-	}
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/conf/sample.properties b/openjdk.test.modularity/src/tests/com.test.jlink/conf/sample.properties
deleted file mode 100644
index 6aa0477f..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/conf/sample.properties
+++ /dev/null
@@ -1 +0,0 @@
-word=Hello
\ No newline at end of file
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/module-info.java b/openjdk.test.modularity/src/tests/com.test.jlink/module-info.java
deleted file mode 100644
index f5d8c460..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/module-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
- 
-module com.test.jlink {
-	requires com.hello;
-	exports adoptopenjdk.test.modularity.jlink;
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/native/JniTest.c b/openjdk.test.modularity/src/tests/com.test.jlink/native/JniTest.c
deleted file mode 100644
index 2136bf14..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/native/JniTest.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-*******************************************************************************
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************
-*/
-
-#include "adoptopenjdk_test_modularity_jlink_JniTest.h"
-
-/*
- * Class:     JniTest
- * Method:    pass
- * Signature: (Z)Z
- * Descrip:   Returns the same value that was input.
- */
-JNIEXPORT jboolean JNICALL Java_adoptopenjdk_test_modularity_jlink_JniTest_pass
-  (JNIEnv * e, jclass c, jboolean b)
-{
-	int i;
-	i = b;
-	return i;
-}
-
-/*
- * Class:     JniTest
- * Method:    turn
- * Signature: (Z)Z
- * Descrip:   Returns the oposite value to the input.
- */
-JNIEXPORT jboolean JNICALL Java_adoptopenjdk_test_modularity_jlink_JniTest_turn
-  (JNIEnv * e, jclass c, jboolean b)
-{
-	int i;
-	i = b;
-	i = !i;
-	return i;
-}
diff --git a/openjdk.test.modularity/src/tests/com.test.jlink/native/makefile b/openjdk.test.modularity/src/tests/com.test.jlink/native/makefile
deleted file mode 100644
index d486f4cf..00000000
--- a/openjdk.test.modularity/src/tests/com.test.jlink/native/makefile
+++ /dev/null
@@ -1,249 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# Usage: gmake [target] [SRC=basename] [OUTDIR=destdir] [JAVA_HOME=javadir] [HEADERDIR=headerdir]
-#		 basename - The name of the C file to compile without the .c extension
-#        target -   The make target valid values for this makefile are build and clean
-#                   If no target is supplied the build target is used.
-#        platform - The platform to build for.  The valid values for this argument are
-#                   AIX_32, AIX_64, linux_390-31, linux_390-64, linux_ppc-32
-#                   linux_ppc-64, linux_x86-32, linux_x86-64, win_x86-32, Win_x86-32
-#                   zos_390-32, zos_390-64
-#        destdir  - The directory where a platform directory will be created and the shared library will be placed 
-#        javadir  - The java.home property directory (ie c:\sdk\jre)
-#        headerdir -The directory containing the header files.
-
-###
-# Figure out current platform
-###
-OS:=$(shell uname -s | tr "[:upper:]" "[:lower:]")
-ARCH:=$(shell uname -m | tr "[:upper:]" "[:lower:]")
-
-.SUFFIXES: .c
-
-CC=gcc
-LD=gcc
-
-PREFIX=lib
-SUFFIX=.so
-OSUFFIX=.o
-
-MV=mv
-MKDIR=mkdir -p
-RMDIR=rm -rf
-RM=rm -rf
-
-# chmod might return non zero if there is a file or directory the current user doesn't own,
-# so tell make to ignore failures
-CHMOD=- chmod
-D=/
-P=:
-
-ifneq (,$(findstring cygwin,$(OS)))
-	OS:=win
-endif
-
-ifneq (,$(findstring darwin,$(OS)))
-	OS:=osx
-	# Detect a M1 processor. Needed because uname -m doesn't work when the shell runs in x86_64 emulation
-	ARCH:=$(shell sysctl -n machdep.cpu.brand_string)
-	ifneq (,$(findstring Apple,$(ARCH)))
-		ARCH:=arm64
-	endif
-endif
-
-ifneq (,$(findstring win,$(OS)))
-	OS:=win
-endif
-
-ifeq ($(OS),os/390)
-	OS:=zos
-endif 
-
-$(info OS = $(OS))
-$(info ARCH is $(ARCH))
-
-DESTDIR=$(OUTDIR)/$(OS)
-OBJDIR=$(HEADERDIR)/$(OS)
-
-space:=$(space) $(space)
-comma:=,
-
-# AIX requires bitmode value to be passed into compilar flags
-ifeq ($(OS),aix)
-	BitMode:=$(shell getconf KERNEL_BITMODE)
-endif 
-
-CFLAGS=-D_JNI_IMPLEMENTATION_ -D_TRIVIAL_AGENT -O0 -g3 -pedantic -c -Wall -std=c99 -fPIC -fno-omit-frame-pointer -static-libgcc -o $(OBJDIR)/$(SRC)$(OSUFFIX)
-LFLAGS=-L. -L../bin/* -shared -o
-# Cater for JAVA_HOME being set either to the jre dir or the parent directory
-IFLAGS=-I. -I$(HEADERDIR) -I$(JAVA_HOME)/include/${OSNAME} -I$(JAVA_HOME)/include -I/usr/include
-
-RMLIST=*.o
-
-ifeq ($(OS),osx)
-    SUFFIX=.dylib
-    LFLAGS=-dynamiclib -o
-    IFLAGS=-I. -I$(HEADERDIR) -I$(JAVA_HOME)/include/darwin -I$(JAVA_HOME)/include -I/usr/include
-    ifeq ($(ARCH),arm64)
-        CFLAGS+=-arch arm64
-        LFLAGS=-arch arm64 -dynamiclib -o
-    endif
-endif
-
-ifeq ($(OS),Win)
-    DESTDIR=$(OUTDIR)\$(OS)
-endif
-
-ifeq ($(OS),win)
-
-    # Environment variable OSTYPE is set to cygwin if running under cygwin.
-    # Set our own macro to indicate we're running under cygwin.
-    # Also Windows commands will need to be prefixed with cmd /c to run them in a Windows shell
-    ifndef CYGWIN
-      OSTYPE?=$(shell echo $$OSTYPE)
-      ifeq ($(OSTYPE),cygwin)
-        CYGWIN:=1
-      else
-        CYGWIN:=0
-      endif
-    endif
-
-    ifeq (0,$(CYGWIN))
-      # mkdir in Windows won't work if the path contains forward slashes
-      DESTDIR := $(subst /,\,$(DESTDIR))
-      OBJDIR := $(subst /,\,$(OBJDIR))
-      # and let's escape backslashes in case one is stripped by the shell
-      DESTDIR := $(subst \,\\,$(DESTDIR))
-      OBJDIR := $(subst \,\\,$(OBJDIR))
-      MV=move
-      MKDIR=mkdir
-      RMDIR=rmdir
-      RM=del /Q
-      D=\\
-      P=;
-    else
-      # cygwin works with forward slashes
-      DESTDIR := $(subst \,/,$(DESTDIR))
-      OBJDIR := $(subst \,/,$(OBJDIR))
-      # Prefix Windows commands with cmd /c to run them in a Windows shell
-      CMD_PREFIX:=cmd /c
-    endif
-    
-    CC=cl
-    LD=link
-    
-    PREFIX=
-    SUFFIX=.dll
-    OSUFFIX=.obj
-    ESUFFIX=.exe
-
-    CFLAGS=/DWIN32 /D_WINDOWS -Gy /LD /Zi /Odi /c /RTC1 /Fo"$(OBJDIR)/$(SRC)$(OSUFFIX)" /Fd"$(OBJDIR)/$(OS)"
-    LFLAGS=/NOLOGO /DLL /INCREMENTAL:NO /NODEFAULTLIB:LIBCMTD /OUT:
-	# Cater for JAVA_HOME being set either to the jre dir or the parent directory
-    IFLAGS=/I. /I"$(HEADERDIR)" /I"$(JAVA_HOME)/../include" /I"$(JAVA_HOME)/../include/win32" /I"$(JAVA_HOME)/include" /I"$(JAVA_HOME)/include/win32"
-
-    RMLIST=*.exp *.lib *.obj
-endif
-
-ifeq ($(OS),zos)
-    CC=c89
-    LD=c89
-    CFLAGS=-W c,exportall -D_JNI_IMPLEMENTATION -D_TRIVIAL_AGENT -W "c,langlvl(extended)" -W "c,float(ieee)" -W "c,convlit(ISO8859-1)" -W "c,xplink,dll" -W "l,xplink,dll" -DZOS -c -o $(OBJDIR)/$(SRC)$(OSUFFIX)
-    LFLAGS=-W l,XPLINK,dll -o 
-    RMLIST=*.o *.x
-endif
-
-ifeq ($(OS),aix)
-    CC=xlC
-    LD=xlC
-    CFLAGS=-D_JNI_IMPLEMENTATION -D_TRIVIAL_AGENT -qnooptimize -g -qlanglvl=stdc99 -q$(BitMode) -c -o $(OBJDIR)/$(SRC)$(OSUFFIX)
-    LFLAGS=-G -q$(BitMode) -o 
-endif
-
-
-##########################################
-# Find the java executable under JAVA_HOME
-##########################################
-
-ifeq ($(OS),win)
-  file_exists = $(shell $(CMD_PREFIX) if exist $(1) echo file exists)
-else
-  file_exists = $(shell if [ -f  $(1) ] ; then echo file exists; fi;)
-endif
-
-ifeq (file exists,$(call file_exists,$(JAVA_HOME)/bin/java$(ESUFFIX)))
-  JAVA_EXECUTABLE=$(JAVA_HOME)/bin/java/$(ESUFFIX)
-endif
-
-ifeq (file exists,$(call file_exists,$(JAVA_HOME)/jre/bin/java$(ESUFFIX)))
-  JAVA_EXECUTABLE=$(JAVA_HOME)/jre/bin/java$(ESUFFIX)
-endif
-
-$(warning JAVA_EXECUTABLE set to $(JAVA_EXECUTABLE))
-
-build: jni
-
-jni: $(DESTDIR) $(OBJDIR) $(DESTDIR)/$(PREFIX)$(SRC)$(SUFFIX)
-
-####################################################################
-# Build shared library and make sure what was built runs ok
-# The test command line was extracted from a run of Axxon_jni_fv.pl,
-# But the invoked test class changed to the individual test rather
-# than the FVRunner test suite class.
-####################################################################
-
-$(DESTDIR)/$(PREFIX)$(SRC)$(SUFFIX): $(OBJDIR)/$(SRC)$(OSUFFIX)
-# Build the shared library
-ifeq ($(OS),osx)
-	$(CMD_PREFIX) $(LD) $(LFLAGS) $(DESTDIR)/$(PREFIX)$(SRC)$(SUFFIX) $(OBJDIR)/$(SRC)$(OSUFFIX)
-else
-	$(CMD_PREFIX) $(LD) $(LFLAGS)$(DESTDIR)/$(PREFIX)$(SRC)$(SUFFIX) $(OBJDIR)/$(SRC)$(OSUFFIX)
-endif
-# chmod might return non zero if there is a file or directory the current user doesn't own,
-# so tell make to ignore failures
-ifneq ($(OS),win)
-	$(CHMOD) 755 $@
-endif
-
-########################################################################################
-# Compile the tests 
-########################################################################################
-
-$(OBJDIR)/$(SRC)$(OSUFFIX): $(SRC).c $(HEADERDIR)/adoptopenjdk_test_modularity_jlink_$(SRC).h
-	$(CMD_PREFIX) $(CC) $(CFLAGS) $(IFLAGS) $(SRC).c
-ifneq ($(OS),win)
-	$(CHMOD) 755 $@
-endif
-
-$(DESTDIR):
-	$(MKDIR) $(DESTDIR)
-ifneq ($(OS),win)
-	$(CHMOD) 755 $(DESTDIR)
-endif
-
-$(OBJDIR):
-	$(MKDIR) $(OBJDIR)
-ifneq ($(OS),win)
-	$(CHMOD) 755 $(OBJDIR)
-endif
-
-# Not all source files have a corresponding header files
-# This dummy target means that if there is a header file and it is out of date then the source
-# will be recompiled.
-# If there is no header file the build will continue (and will fail if there should actually be a header file).
-$(HEADERDIR)/adoptopenjdk_test_modularity_jlink_$(SRC).h:
-	echo $(HEADERDIR)/adoptopenjdk_test_modularity_jlink_$(SRC).h is out of date or not present
-
-clean:
-	$(RMDIR) $(OUTDIR)/$(OS)
-	$(RMDIR) $(HEADERDIR)/$(OS)