diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt
index 5f9fa7e7092..67f127788d4 100644
--- a/sdk/lib/3rdparty/freetype/CMakeLists.txt
+++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt
@@ -47,6 +47,7 @@ list(APPEND SOURCE
     src/winfonts/winfnt.c)
 
 add_library(freetype ${SOURCE})
+add_importlibs(freetype ntdll)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND ARCH STREQUAL "amd64")
     # error C4312: 'type cast': conversion from 'unsigned long' to 'void *' of greater size
diff --git a/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c b/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c
index 8d9737310c7..8e4fac60a3d 100644
--- a/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c
+++ b/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c
@@ -15,7 +15,11 @@
  *
  */
 
-
+/* PSDK/NDK Headers */
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <debug.h>
 #include <ft2build.h>
 #include FT_INTERNAL_DEBUG_H
 
@@ -1403,8 +1407,8 @@
           /* if p > limit, the whole segment is invalid */
           if ( next && p > limit )
             break;
-
-          gindex = TT_PEEK_USHORT( p );
+DPRINT1("charcode is 0x%x\n", charcode);
+          gindex = TT_PEEK_USHORT( p ); // CORE-12549
           if ( gindex )
           {
             gindex = (FT_UInt)( (FT_Int)gindex + delta ) & 0xFFFFU;