Move core/fxcrt/include to core/fxcrt

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2382723003
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h
index dd9a176..7fe0de4 100644
--- a/core/fxge/include/cfx_fontcache.h
+++ b/core/fxge/include/cfx_fontcache.h
@@ -10,7 +10,7 @@
 #include <map>
 #include <memory>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxge/include/fx_font.h"
 #include "core/fxge/include/fx_freetype.h"
 
diff --git a/core/fxge/include/cfx_graphstate.h b/core/fxge/include/cfx_graphstate.h
index 9470303..1faec0d 100644
--- a/core/fxge/include/cfx_graphstate.h
+++ b/core/fxge/include/cfx_graphstate.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
 #define CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
 
-#include "core/fxcrt/include/cfx_count_ref.h"
+#include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 
 class CPDF_Array;
diff --git a/core/fxge/include/cfx_graphstatedata.h b/core/fxge/include/cfx_graphstatedata.h
index 2e79698..b5f7847 100644
--- a/core/fxge/include/cfx_graphstatedata.h
+++ b/core/fxge/include/cfx_graphstatedata.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
 #define CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 
 class CFX_GraphStateData {
  public:
diff --git a/core/fxge/include/cfx_pathdata.h b/core/fxge/include/cfx_pathdata.h
index 6bc627c..56682dd 100644
--- a/core/fxge/include/cfx_pathdata.h
+++ b/core/fxge/include/cfx_pathdata.h
@@ -7,8 +7,8 @@
 #ifndef CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
 #define CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
 
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 struct FX_PATHPOINT {
diff --git a/core/fxge/include/cfx_substfont.h b/core/fxge/include/cfx_substfont.h
index a712a7a..8cce389 100644
--- a/core/fxge/include/cfx_substfont.h
+++ b/core/fxge/include/cfx_substfont.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
 #define CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
 
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
 
 #define FXFONT_SUBST_MM 0x01
 #define FXFONT_SUBST_GLYPHPATH 0x04
diff --git a/core/fxge/include/cfx_unicodeencodingex.h b/core/fxge/include/cfx_unicodeencodingex.h
index 2ce062f..680b8fb 100644
--- a/core/fxge/include/cfx_unicodeencodingex.h
+++ b/core/fxge/include/cfx_unicodeencodingex.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxge/include/cfx_unicodeencoding.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/include/fx_dib.h b/core/fxge/include/fx_dib.h
index 011e6f7..2eaa38a 100644
--- a/core/fxge/include/fx_dib.h
+++ b/core/fxge/include/fx_dib.h
@@ -10,9 +10,9 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
 
 enum FXDIB_Format {
   FXDIB_Invalid = 0,
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index 5a83130..2151bf6 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxge/include/cfx_substfont.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/include/ifx_renderdevicedriver.h b/core/fxge/include/ifx_renderdevicedriver.h
index e9dbed9..995e82d 100644
--- a/core/fxge/include/ifx_renderdevicedriver.h
+++ b/core/fxge/include/ifx_renderdevicedriver.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
 #define CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 
 class CFX_DIBitmap;
 class CFX_DIBSource;