--- old/src/java.desktop/share/native/libfontmanager/hb-jdk.h	2019-03-06 15:02:57.234206400 +0300
+++ new/src/java.desktop/share/native/libfontmanager/hb-jdk.h	2019-03-06 15:02:56.720327900 +0300
@@ -29,7 +29,6 @@
 #include "hb.h"
 #include <jni.h>
 #include <sunfontids.h>
-#include <fontscalerdefs.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -40,7 +39,6 @@
     jobject font2D;
     jobject fontStrike;
     long nativeFont;
-    TTLayoutTableCache *layoutTables;
     float matrix[4];
     float ptSize;
     float xPtSize;
@@ -65,7 +63,8 @@
 hb_jdk_face_create(JDKFontInfo*   jdkFontInfo,
                    hb_destroy_func_t destroy);
 hb_font_t *
-hb_jdk_font_create(JDKFontInfo*   jdkFontInfo,
+hb_jdk_font_create(hb_face_t* hbFace,
+                   JDKFontInfo*   jdkFontInfo,
                    hb_destroy_func_t destroy);