| Index: pdfium.gyp
 | 
| diff --git a/pdfium.gyp b/pdfium.gyp
 | 
| index f43f58d98522a1a2e3ab37bcccd83ee49aaf5944..44aac842a94531662a6413211d4d794614c0079a 100644
 | 
| --- a/pdfium.gyp
 | 
| +++ b/pdfium.gyp
 | 
| @@ -566,17 +566,6 @@
 | 
|        'target_name': 'fxcrt',
 | 
|        'type': 'static_library',
 | 
|        'sources': [
 | 
| -        'core/include/fxcrt/fx_basic.h',
 | 
| -        'core/include/fxcrt/fx_bidi.h',
 | 
| -        'core/include/fxcrt/fx_coordinates.h',
 | 
| -        'core/include/fxcrt/fx_ext.h',
 | 
| -        'core/include/fxcrt/fx_memory.h',
 | 
| -        'core/include/fxcrt/fx_safe_types.h',
 | 
| -        'core/include/fxcrt/fx_stream.h',
 | 
| -        'core/include/fxcrt/fx_string.h',
 | 
| -        'core/include/fxcrt/fx_system.h',
 | 
| -        'core/include/fxcrt/fx_ucd.h',
 | 
| -        'core/include/fxcrt/fx_xml.h',
 | 
|          'core/fxcrt/extension.h',
 | 
|          'core/fxcrt/fxcrt_platforms.cpp',
 | 
|          'core/fxcrt/fxcrt_platforms.h',
 | 
| @@ -597,18 +586,29 @@
 | 
|          'core/fxcrt/fx_basic_util.cpp',
 | 
|          'core/fxcrt/fx_basic_wstring.cpp',
 | 
|          'core/fxcrt/fx_bidi.cpp',
 | 
| +        'core/fxcrt/fx_bidi.h',
 | 
|          'core/fxcrt/fx_extension.cpp',
 | 
|          'core/fxcrt/fx_ucddata.cpp',
 | 
|          'core/fxcrt/fx_unicode.cpp',
 | 
|          'core/fxcrt/fx_xml_composer.cpp',
 | 
|          'core/fxcrt/fx_xml_parser.cpp',
 | 
| +        'core/fxcrt/include/fx_basic.h',
 | 
| +        'core/fxcrt/include/fx_coordinates.h',
 | 
| +        'core/fxcrt/include/fx_ext.h',
 | 
| +        'core/fxcrt/include/fx_memory.h',
 | 
| +        'core/fxcrt/include/fx_safe_types.h',
 | 
| +        'core/fxcrt/include/fx_stream.h',
 | 
| +        'core/fxcrt/include/fx_string.h',
 | 
| +        'core/fxcrt/include/fx_system.h',
 | 
| +        'core/fxcrt/include/fx_ucd.h',
 | 
| +        'core/fxcrt/include/fx_xml.h',
 | 
|          'core/fxcrt/plex.h',
 | 
|          'core/fxcrt/xml_int.h',
 | 
|        ],
 | 
|        'conditions': [
 | 
|          ['pdf_enable_xfa==1', {
 | 
|            'sources': [
 | 
| -            'core/include/fxcrt/fx_arb.h',
 | 
| +            'core/fxcrt/include/fx_arb.h',
 | 
|              'core/fxcrt/fx_arabic.cpp',
 | 
|              'core/fxcrt/fx_arabic.h',
 | 
|              'core/fxcrt/fx_basic_maps.cpp',
 | 
| 
 |