Move core/fxcodec/codec/include and core/fxcodec/include files up

core/fxcodec/fx_codec.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 CORE_FXCODEC_INCLUDE_FX_CODEC_H_
-#define CORE_FXCODEC_INCLUDE_FX_CODEC_H_
+#ifndef CORE_FXCODEC_FX_CODEC_H_
+#define CORE_FXCODEC_FX_CODEC_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "core/fxcodec/codec/ccodec_basicmodule.h"
 #include "core/fxcodec/codec/ccodec_faxmodule.h"
 #include "core/fxcodec/codec/ccodec_flatemodule.h"
 #include "core/fxcodec/codec/ccodec_iccmodule.h"
 #include "core/fxcodec/codec/ccodec_jbig2module.h"
 #include "core/fxcodec/codec/ccodec_jpegmodule.h"
 #include "core/fxcodec/codec/ccodec_jpxmodule.h"
 #include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
-#include "core/fxcodec/include/fx_codec_def.h"
+#include "core/fxcodec/fx_codec_def.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 
 class CFX_DIBSource;
 class CJPX_Decoder;
 class CPDF_ColorSpace;
 class CPDF_StreamAcc;
 
 #ifdef PDF_ENABLE_XFA
 #include "core/fxcodec/codec/ccodec_bmpmodule.h"
@@ skipping 86 matching lines @@
                         uint8_t& B);
 FX_BOOL MD5ComputeID(const void* buf, uint32_t dwSize, uint8_t ID[16]);
 void FaxG4Decode(const uint8_t* src_buf,
                  uint32_t src_size,
                  int* pbitpos,
                  uint8_t* dest_buf,
                  int width,
                  int height,
                  int pitch);
 
-#endif  // CORE_FXCODEC_INCLUDE_FX_CODEC_H_
+#endif  // CORE_FXCODEC_FX_CODEC_H_