| Index: core/fxcrt/include/fx_safe_types.h
 | 
| diff --git a/core/include/fxcrt/fx_safe_types.h b/core/fxcrt/include/fx_safe_types.h
 | 
| similarity index 70%
 | 
| rename from core/include/fxcrt/fx_safe_types.h
 | 
| rename to core/fxcrt/include/fx_safe_types.h
 | 
| index 6ae3ee10548683e877c405a12d3d235d1d9291ca..47eb55ddd525885deafdb35bc1905a6272179419 100644
 | 
| --- a/core/include/fxcrt/fx_safe_types.h
 | 
| +++ b/core/fxcrt/include/fx_safe_types.h
 | 
| @@ -2,13 +2,13 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef CORE_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
 | 
| -#define CORE_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
 | 
| +#ifndef CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
 | 
| +#define CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
 | 
|  
 | 
|  #include <stdlib.h>  // For size_t.
 | 
|  
 | 
| -#include "core/include/fxcrt/fx_stream.h"  // for FX_FILESIZE.
 | 
| -#include "core/include/fxcrt/fx_system.h"
 | 
| +#include "core/fxcrt/include/fx_stream.h"  // for FX_FILESIZE.
 | 
| +#include "core/fxcrt/include/fx_system.h"
 | 
|  #include "third_party/base/numerics/safe_math.h"
 | 
|  
 | 
|  typedef pdfium::base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD;
 | 
| @@ -17,4 +17,4 @@ typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T;
 | 
|  typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
 | 
|  typedef pdfium::base::CheckedNumeric<FX_STRSIZE> FX_SAFE_STRSIZE;
 | 
|  
 | 
| -#endif  // CORE_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
 | 
| +#endif  // CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
 | 
| 
 |