Merge to XFA: Fix the way FT headers are included

core/include/fxge/fx_freetype.h

Index: core/include/fxge/fx_freetype.h
diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h
index c7c8295961704597e9f3221c1bb89b74dd7a58ba..5721784eb76a84234985c3f5934620755d675881 100644
--- a/core/include/fxge/fx_freetype.h
+++ b/core/include/fxge/fx_freetype.h
@@ -8,12 +8,13 @@
 #define CORE_INCLUDE_FXGE_FX_FREETYPE_H_
 
 #include <ft2build.h>
-#include <freetype.h>
-#include <ftglyph.h>
-#include <ftlcdfil.h>
-#include <ftmm.h>
-#include <ftoutln.h>
-#include <tttables.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_LCD_FILTER_H
+#include FT_MULTIPLE_MASTERS_H
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_TABLES_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif