--- old/src/java.base/share/native/libjli/wildcard.c	2018-07-26 12:40:56.000000000 -0700
+++ new/src/java.base/share/native/libjli/wildcard.c	2018-07-26 12:40:55.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -100,6 +100,12 @@
 #include <dirent.h>
 #endif /* Unix */
 
+#if defined(_AIX)
+  #define DIR DIR64
+  #define opendir opendir64
+  #define closedir closedir64
+#endif
+
 static int
 exists(const char* filename)
 {
--- old/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c	2018-07-26 12:40:56.000000000 -0700
+++ new/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c	2018-07-26 12:40:56.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -58,6 +58,12 @@
 #include <procfs.h>
 #endif
 
+#if defined(_AIX)
+  #define DIR DIR64
+  #define opendir opendir64
+  #define closedir closedir64
+#endif
+
 /**
  * This file contains the implementation of the native ProcessHandleImpl
  * functions which are common to all Unix variants.
--- old/src/java.base/unix/native/libjava/TimeZone_md.c	2018-07-26 12:40:56.000000000 -0700
+++ new/src/java.base/unix/native/libjava/TimeZone_md.c	2018-07-26 12:40:56.000000000 -0700
@@ -55,6 +55,12 @@
 #define readdir64 readdir
 #endif
 
+#if defined(_AIX)
+  #define DIR DIR64
+  #define opendir opendir64
+  #define closedir closedir64
+#endif
+
 #if !defined(__solaris__) || defined(__sparcv9) || defined(amd64)
 #define fileopen        fopen
 #define filegets        fgets