--- old/test/jdk/com/sun/tools/jextract/jclang-ffi/src/jdk/internal/clang/Index.java	2019-04-09 21:07:47.000000000 +0530
+++ new/test/jdk/com/sun/tools/jextract/jclang-ffi/src/jdk/internal/clang/Index.java	2019-04-09 21:07:46.000000000 +0530
@@ -30,8 +30,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import clang.Index.CXTranslationUnitImpl;
-import clang.Index.CXDiagnostic;
+import clang.Index_h.CXTranslationUnitImpl;
+import clang.Index_h.CXDiagnostic;
 
 public class Index {
     // Pointer to CXIndex
@@ -45,7 +45,7 @@
     }
 
     public TranslationUnit parseTU(String file, String... args) {
-        final clang.Index lclang = LibClang.lib;
+        final clang.Index_h lclang = LibClang.lib;
 
         try (Scope scope = Scope.globalScope().fork()) {
             Pointer<Byte> src = scope.allocateCString(file);
@@ -58,7 +58,7 @@
     }
 
     public Cursor parse(String file, Consumer<Diagnostic> eh, boolean detailedPreprocessorRecord, String... args) {
-        final clang.Index lclang = LibClang.lib;
+        final clang.Index_h lclang = LibClang.lib;
 
         try (Scope scope = Scope.globalScope().fork()) {
             Pointer<Byte> src = scope.allocateCString(file);