--- old/test/hotspot/jtreg/runtime/jni/FindClass/libbootLoaderTest.c	2020-07-22 18:21:41.249230364 -0400
+++ new/test/hotspot/jtreg/runtime/jni/FindClass/libbootLoaderTest.c	2020-07-22 18:21:40.136216461 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "jni.h"
-#include "jni_util.h"
 
 JNIEXPORT jclass JNICALL
 Java_java_lang_BootNativeLibrary_findClass
--- old/test/hotspot/jtreg/runtime/jni/registerNativesWarning/libregisterNativesWarning.c	2020-07-22 18:21:44.575271911 -0400
+++ new/test/hotspot/jtreg/runtime/jni/registerNativesWarning/libregisterNativesWarning.c	2020-07-22 18:21:43.493258395 -0400
@@ -24,7 +24,6 @@
 #include <stdio.h>
 
 #include "jni.h"
-#include "jni_util.h"
 
 /*
  * We will replace:
--- old/test/hotspot/jtreg/runtime/jni/terminatedThread/libterminatedThread.c	2020-07-22 18:21:47.916313646 -0400
+++ new/test/hotspot/jtreg/runtime/jni/terminatedThread/libterminatedThread.c	2020-07-22 18:21:46.808299805 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -28,8 +28,6 @@
 #include <string.h>
 
 #include "jni.h"
-#include "jni_util.h"
-
 
 JavaVM* jvm;
 jobject nativeThread;
--- old/test/jdk/java/lang/ClassLoader/nativeLibrary/libnativeLibraryTest.c	2020-07-22 18:21:51.300355917 -0400
+++ new/test/jdk/java/lang/ClassLoader/nativeLibrary/libnativeLibraryTest.c	2020-07-22 18:21:50.206342251 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "jni.h"
-#include "jni_util.h"
 
 static jint count = 0;
 static jclass test_class;
--- old/test/jdk/java/lang/ProcessBuilder/checkHandles/libCheckHandles.c	2020-07-22 18:21:54.617397352 -0400
+++ new/test/jdk/java/lang/ProcessBuilder/checkHandles/libCheckHandles.c	2020-07-22 18:21:53.531383786 -0400
@@ -27,7 +27,6 @@
 #ifdef _WIN32
 
 #include "jni.h"
-#include "jni_util.h"
 #include <windows.h>
 
 JNIEXPORT jlong JNICALL Java_CheckHandles_getProcessHandleCount(JNIEnv *env)
--- old/test/jdk/jdk/internal/loader/NativeLibraries/libnativeLibrariesTest.c	2020-07-22 18:21:58.236442559 -0400
+++ new/test/jdk/jdk/internal/loader/NativeLibraries/libnativeLibrariesTest.c	2020-07-22 18:21:56.864425421 -0400
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "jni.h"
-#include "jni_util.h"
 
 static jclass test_class;
 static jint current_jni_version = JNI_VERSION_10;