--- old/test/jdk/com/sun/tools/jextract/jclang-ffi/src/jdk/internal/clang/LibClang.java	2019-04-09 23:54:21.000000000 +0530
+++ new/test/jdk/com/sun/tools/jextract/jclang-ffi/src/jdk/internal/clang/LibClang.java	2019-04-09 23:54:20.000000000 +0530
@@ -22,7 +22,7 @@
  */
 package jdk.internal.clang;
 
-import clang.CXString.CXString;
+import clang.CXString_h.CXString;
 
 import java.foreign.Libraries;
 import java.foreign.Library;
@@ -33,8 +33,8 @@
 public class LibClang {
     private static final boolean DEBUG = Boolean.getBoolean("libclang.debug");
 
-    static final clang.Index lib;
-    private static final clang.CXString lcxstr;
+    static final clang.Index_h lib;
+    private static final clang.CXString_h lcxstr;
 
     static {
         if (DEBUG) {
@@ -44,8 +44,8 @@
                 ? "libclang"
                 : "clang";
         Library libclang = Libraries.loadLibrary(MethodHandles.lookup(), libName);
-        lib = Libraries.bind(clang.Index.class, libclang);
-        lcxstr = Libraries.bind(clang.CXString.class, libclang);
+        lib = Libraries.bind(clang.Index_h.class, libclang);
+        lcxstr = Libraries.bind(clang.CXString_h.class, libclang);
     }
 
     public static Index createIndex(boolean local) {