Merge to XFA: Remove rendundant ../include from paths.

core/include/fxge/fx_font.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_FONT_H_
-#define _FX_FONT_H_
-#ifndef _FXCRT_EXTENSION_
-#include "../../include/fxcrt/fx_ext.h"
-#endif
-#ifndef _FX_DIB_H_
+#ifndef FX_FONT_H_
+#define FX_FONT_H_
+
+#include "../fxcrt/fx_ext.h"
 #include "fx_dib.h"
-#endif
+
 typedef struct FT_FaceRec_* FXFT_Face;
 typedef void* FXFT_Library;
 class IFX_FontEncoding;
 class CFX_PathData;
 class CFX_SubstFont;
 class CFX_FaceCache;
 class IFX_FontMapper;
 class CFX_FontMapper;
 class IFX_SystemFontInfo;
 class CFontFileFaceInfo;
@@ skipping 442 matching lines @@
 class IFX_GSUBTable
 {
 public:
     virtual void        Release() = 0;
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 
 protected:
      ~IFX_GSUBTable() { }
 };
 IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
-#endif
+
+#endif  // FX_FONT_H_