diff -r 28b2dbe488f1 -r a8e9aff89f7b src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp
--- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Wed Oct 18 19:36:17 2017 -0700
+++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Thu Oct 19 11:59:52 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,9 +26,9 @@
 #ifndef CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
 #define CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
 
+#include "jni.h"
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
-#include "prims/jni.h"
 
 // This file holds platform-dependent routines used to write primitive jni
 // types to the array of arguments passed into JavaCalls::call