diff --git a/Modules/ThirdParty/TIFF/CMakeLists.txt b/Modules/ThirdParty/TIFF/CMakeLists.txt
index 25ee48003a5..c016a37182a 100644
--- a/Modules/ThirdParty/TIFF/CMakeLists.txt
+++ b/Modules/ThirdParty/TIFF/CMakeLists.txt
@@ -18,9 +18,8 @@ if(ITK_USE_SYSTEM_TIFF)
 else()
   set(ITKTIFF_INCLUDE_DIRS
     ${ITKTIFF_BINARY_DIR}/src
-    ${ITKTIFF_BINARY_DIR}/src/itktiff
+    ${ITKTIFF_BINARY_DIR}/src/itktiff/libtiff
     ${ITKTIFF_SOURCE_DIR}/src
-    ${ITKTIFF_SOURCE_DIR}/src/itktiff
     )
   set(ITKTIFF_LIBRARIES itktiff)
   set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
diff --git a/Modules/ThirdParty/TIFF/src/itk_tiff.h.in b/Modules/ThirdParty/TIFF/src/itk_tiff.h.in
index 40ee5ed141b..c9bdf3e7e1c 100644
--- a/Modules/ThirdParty/TIFF/src/itk_tiff.h.in
+++ b/Modules/ThirdParty/TIFF/src/itk_tiff.h.in
@@ -34,7 +34,7 @@
 #ifdef ITK_USE_SYSTEM_TIFF
 # include <tiffio.h>
 #else
-# include "itktiff/tiffio.h"
+# include "itktiff/libtiff/tiffio.h"
 #endif
 
 #endif
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/itk_tiff_mangle.h b/Modules/ThirdParty/TIFF/src/itktiff/itk_tiff_mangle.h
deleted file mode 100644
index 718f43ae899..00000000000
--- a/Modules/ThirdParty/TIFF/src/itktiff/itk_tiff_mangle.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This allows "tiff.h" to include "itk_tiff_mangle.h" in the ITK build.
-   Do NOT install this header.  */
-#include "libtiff/itk_tiff_mangle.h"
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/tiffio.h b/Modules/ThirdParty/TIFF/src/itktiff/tiffio.h
deleted file mode 100644
index 0e0f1a1be0f..00000000000
--- a/Modules/ThirdParty/TIFF/src/itktiff/tiffio.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This allows "itk_tiff.h" to include "itktiff/tiffio.h" in the ITK build.
-   Do NOT install this header.  */
-#include "libtiff/tiffio.h"