Remove more defines in XFA branch that aren't used for PDFium.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/811493002

35 files changed, 1 insertions, 70 deletions

diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c
index 752e8d6ef4..7d712146dd 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c
@@ -29,7 +29,6 @@
  *
  * Auxiliary Support Routines.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include "tif_predict.h"
 #include <math.h>
@@ -357,4 +356,4 @@ _TIFFUInt64ToDouble(uint64 ui64)
  * fill-column: 78
  * End:
  */
- #endif
+ 
\ No newline at end of file
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c
index eebb30a41c..6181b97e2e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c
@@ -27,7 +27,6 @@
 /*
  * TIFF Library.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <string.h>
 
@@ -139,5 +138,4 @@ TIFFClose(TIFF* tif)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c
index 16d237f79a..012a90b5e6 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c
@@ -29,7 +29,6 @@
  *
  * Builtin Compression Scheme Configuration Support.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 static int NotConfigured(TIFF*, int);
@@ -164,5 +163,4 @@ TIFFIsCODECConfigured(uint16 scheme)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c
index 71effbce92..c55a4afeb2 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c
@@ -35,7 +35,6 @@
  *
  * Color space conversion routines.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <math.h>
 
@@ -285,5 +284,4 @@ TIFFYCbCrToRGBInit(TIFFYCbCrToRGB* ycbcr, float *luma, float *refBlackWhite)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c
index 5b2b4d5948..3a1e15f3ba 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c
@@ -29,7 +29,6 @@
  *
  * Compression Scheme Configuration Support.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 static int
@@ -303,5 +302,4 @@ TIFFGetConfiguredCODECs()
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c
index 076d9b4ea0..06951b4d17 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c
@@ -30,7 +30,6 @@
  * Directory Tag Get & Set Routines.
  * (and also some miscellaneous stuff)
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*
@@ -1658,5 +1657,4 @@ TIFFUnlinkDirectory(TIFF* tif, uint16 dirn)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c
index 5f28d23602..2914d4079b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c
@@ -29,7 +29,6 @@
  *
  * Core Directory Tag Support.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <stdlib.h>
 
@@ -974,5 +973,4 @@ TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], uint32 n)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c
index bd28d6926d..b9e4ffae09 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c
@@ -39,7 +39,6 @@
  *   TIFFReadDirectory, so as to eliminate current possibly repetitive lookup.
  */
  
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 #define IGNORE 0          /* tag placeholder used below */
@@ -5612,5 +5611,4 @@ int _TIFFFillStriles( TIFF *tif )
  * fill-column: 78
  * End:
  */
- #endif
  
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c
index ac13cd4916..fa20609e2b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c
@@ -29,7 +29,6 @@
  *
  * Directory Write Support Routines.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 #ifdef HAVE_IEEEFP
@@ -2909,4 +2908,3 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype,
  * fill-column: 78
  * End:
  */
-#endif
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c
index 78ab03f608..8f582e7be5 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c
@@ -29,7 +29,6 @@
  *
  * "Null" Compression Algorithm Support.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 static int
@@ -142,5 +141,4 @@ TIFFInitDumpMode(TIFF* tif, int scheme)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c
index 3a478c328e..8c0ef6cf9b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c
@@ -27,7 +27,6 @@
 /*
  * TIFF Library.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;*/
@@ -81,5 +80,4 @@ TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c
index 474cd790cd..32d10cb7ad 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c
@@ -30,7 +30,6 @@
  * Various routines support external extension of the tag set, and other
  * application extension capabilities. 
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 int TIFFGetTagListCount( TIFF *tif )
@@ -116,5 +115,4 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const char *name )
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c
index 986a3f48b9..7ec8faa8b0 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef CCITT_SUPPORT
 /*
@@ -1621,5 +1620,4 @@ TIFFInitCCITTRLEW(TIFF* tif, int scheme)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c
index 47a532cbd6..c943f3e42f 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c
@@ -1,6 +1,5 @@
 /* WARNING, this file was automatically generated by the
     mkg3states program */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiff.h"
 #include "tif_fax3.h"
  const TIFFFaxTabEnt TIFFFaxMainTable[128] = {
@@ -1259,5 +1258,4 @@
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c
index 075b3bcf33..976cbc4cde 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c
@@ -27,7 +27,6 @@
 /*
  * TIFF Library.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 int
@@ -117,5 +116,4 @@ TIFFFlushData(TIFF* tif)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c
index a5d7a44e19..35c4786018 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c
@@ -29,7 +29,6 @@
  *
  * Read and return a packed RGBA image.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <stdio.h>
 
@@ -2987,5 +2986,4 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
index 84f0f9e66d..d02f1f35e2 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
 
@@ -2307,5 +2306,4 @@ here hopefully is harmless.
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c
index 0c2298989b..88f4ee85a0 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef LOGLUV_SUPPORT
 
@@ -1683,5 +1682,4 @@ bad:
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c
index 5c9ab0bf74..3a6f4c82c7 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef LZW_SUPPORT
 /*
@@ -1165,5 +1164,4 @@ bad:
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c
index 8c4fec456f..9f2f6d5307 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef NEXT_SUPPORT
 /*
@@ -158,5 +157,4 @@ TIFFInitNeXT(TIFF* tif, int scheme)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
index bed4f9be7e..dfd1403aa5 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
@@ -120,7 +120,6 @@
    session.
 */
 
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
@@ -2502,5 +2501,4 @@ OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo)
  * fill-column: 78
  * End:
  */
-#endif//#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c
index 95e8d1f8b9..f1c3e0a4a6 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c
@@ -27,7 +27,6 @@
 /*
  * TIFF Library.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*
@@ -724,5 +723,4 @@ TIFFGetUnmapFileProc(TIFF* tif)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c
index 6fb517f7e5..b599934f1f 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef PACKBITS_SUPPORT
 /*
@@ -298,5 +297,4 @@ TIFFInitPackBits(TIFF* tif, int scheme)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
index 5aaf8be0d9..9521338da3 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef PIXARLOG_SUPPORT
 
@@ -1424,5 +1423,4 @@ bad:
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c
index 190d01644a..a34faf0a70 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c
@@ -29,7 +29,6 @@
  *
  * Predictor Tag Support (used by multiple codecs).
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include "tif_predict.h"
 
@@ -809,5 +808,4 @@ TIFFPredictorCleanup(TIFF* tif)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c
index 3ee43fc79f..f93e557f5c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c
@@ -29,7 +29,6 @@
  *
  * Directory Printing Support
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <stdio.h>
 
@@ -715,5 +714,4 @@ _TIFFprintAsciiTag(FILE* fd, const char* name, const char* value)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c
index a25a5a6894..eb9350846e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c
@@ -28,7 +28,6 @@
  * TIFF Library.
  * Scanline-oriented Read Support
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <stdio.h>
 
@@ -1112,5 +1111,4 @@ _TIFFSwab64BitData(TIFF* tif, uint8* buf, tmsize_t cc)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c
index 047c59814c..2c15a70bdc 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c
@@ -29,7 +29,6 @@
  *
  * Strip-organized Image Support Routines.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*
@@ -382,5 +381,4 @@ TIFFRasterScanlineSize(TIFF* tif)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c
index a60814bee2..205e529c2c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c
@@ -29,7 +29,6 @@
  *
  * XXX We assume short = 16-bits and long = 32-bits XXX
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 #ifndef TIFFSwabShort
@@ -309,5 +308,4 @@ TIFFReverseBits(uint8* cp, tmsize_t n)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c
index e7cb0d4df5..e2d4ac0439 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <assert.h>
 #ifdef THUNDER_SUPPORT
@@ -206,5 +205,4 @@ TIFFInitThunderScan(TIFF* tif, int scheme)
  * End:
  */
 
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c
index 24ba82c040..cb59a598e8 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c
@@ -29,7 +29,6 @@
  *
  * Tiled Image Support Routines.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*
@@ -298,5 +297,4 @@ _TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c
index 41aa8b0dcd..30119d205c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c
@@ -22,7 +22,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 static const char TIFFVersion[] = TIFFLIB_VERSION_STR;
@@ -39,5 +38,4 @@ TIFFGetVersion(void)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c
index ac6b3b938f..997f353688 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c
@@ -27,7 +27,6 @@
 /*
  * TIFF Library.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 
 /*TIFFErrorHandlerExt _TIFFwarningHandlerExt = NULL;*/
@@ -82,6 +81,5 @@ TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...)
  * fill-column: 78
  * End:
  */
-#endif
 
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c
index 11a537c9d0..f32ee9078b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c
@@ -29,7 +29,6 @@
  *
  * Scanline-oriented Write Support
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #include <stdio.h>
 
@@ -770,5 +769,4 @@ TIFFSetWriteOffset(TIFF* tif, toff_t off)
  * fill-column: 78
  * End:
  */
-#endif
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
index 0bb2a8cb29..f6e235842b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
+++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
@@ -23,7 +23,6 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#if (!defined(_FPDFAPI_MINI_) || defined(_TIFF_DECODER_)) && !defined(_USE_ADDIN_) && !defined _FX_NO_ANSIC_ && !defined(_FX_EMB_NOUSE_DECODER_)
 #include "tiffiop.h"
 #ifdef ZIP_SUPPORT
 /*
@@ -467,5 +466,4 @@ bad:
  * fill-column: 78
  * End:
  */
-#endif