From b430486d380740d6809dcd02343dd7c01da275d4 Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Mon, 30 Nov 2020 20:26:22 +0100
Subject: [PATCH] Fix namespaces

---
 .../Tiff/Compression/ModifiedHuffmanTiffCompression.cs    | 1 +
 .../Formats/Tiff/Compression/T4TiffCompression.cs         | 2 ++
 .../Formats/Tiff/Compression/TiffBaseCompression.cs       | 2 ++
 .../Formats/Tiff/Compression/TiffCompressionFactory.cs    | 1 +
 src/ImageSharp/Formats/Tiff/Constants/TiffByteOrder.cs    | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs  | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs    | 4 ++--
 src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs | 4 ++--
 src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs    | 2 +-
 .../Formats/Tiff/Constants/TiffNewSubfileType.cs          | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs  | 4 ++--
 .../Tiff/Constants/TiffPhotometricInterpretation.cs       | 2 +-
 .../Formats/Tiff/Constants/TiffPlanarConfiguration.cs     | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffPredictor.cs    | 2 +-
 .../Formats/Tiff/Constants/TiffResolutionUnit.cs          | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffSampleFormat.cs | 2 +-
 src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs  | 2 +-
 .../{TiffThreshholding.cs => TiffThresholding.cs}         | 8 ++++----
 src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs        | 3 +++
 src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs            | 5 +++--
 .../Formats/Tiff/Streams/TiffBigEndianStream.cs           | 6 ++++--
 .../Formats/Tiff/Streams/TiffLittleEndianStream.cs        | 6 ++++--
 src/ImageSharp/Formats/Tiff/Streams/TiffStream.cs         | 3 ++-
 src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs            | 2 ++
 src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs         | 2 ++
 src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs            | 1 +
 src/ImageSharp/Formats/Tiff/TiffFormat.cs                 | 2 ++
 src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs          | 3 ++-
 src/ImageSharp/Formats/Tiff/TiffMetadata.cs               | 2 ++
 tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs   | 4 +++-
 tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs  | 2 ++
 31 files changed, 58 insertions(+), 29 deletions(-)
 rename src/ImageSharp/Formats/Tiff/Constants/{TiffThreshholding.cs => TiffThresholding.cs} (70%)

diff --git a/src/ImageSharp/Formats/Tiff/Compression/ModifiedHuffmanTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/ModifiedHuffmanTiffCompression.cs
index 95a41ed54b..b9866c6f2f 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/ModifiedHuffmanTiffCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/ModifiedHuffmanTiffCompression.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Tiff.Compression
diff --git a/src/ImageSharp/Formats/Tiff/Compression/T4TiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/T4TiffCompression.cs
index 9220836036..e6d2b4be00 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/T4TiffCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/T4TiffCompression.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.IO;
+
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Tiff.Compression
diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs
index f24db500b3..00da17973d 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/TiffBaseCompression.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.IO;
+
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Tiff.Compression
diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs
index d32052fcd6..07ca529540 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/TiffCompressionFactory.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Tiff.Compression
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffByteOrder.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffByteOrder.cs
index b6418d11db..e96824fba6 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffByteOrder.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffByteOrder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// The tiff data stream byte order enum.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
index a8a46409f1..ff371e6171 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the compression formats defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
index c19072ef0a..a265544121 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
@@ -1,9 +1,9 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Defines constants defined in the TIFF specification.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
index b306105db1..c10167d250 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the possible uses of extra components in TIFF format files.
@@ -23,4 +23,4 @@ namespace SixLabors.ImageSharp.Formats.Tiff
         /// </summary>
         UnassociatedAlpha = 2
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
index 3febf2a96e..1bb75f8366 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the fill orders defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
index 35c4439cb0..3b84120a5c 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the sub-file types defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
index bb61b51bd0..a5305d4824 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the image orientations defined by the Tiff file-format.
@@ -48,4 +48,4 @@ namespace SixLabors.ImageSharp.Formats.Tiff
         /// </summary>
         LeftBottom = 8
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
index dc8225a7af..2e5f3064bf 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the photometric interpretation formats defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
index e04e100e62..6249a935ed 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing how the components of each pixel are stored the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffPredictor.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPredictor.cs
index 03965c06f0..092bb7aa52 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffPredictor.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffPredictor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// A mathematical operator that is applied to the image data before an encoding scheme is applied.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
index a523f0bc2a..bf7a5e9a76 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the resolution units defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffSampleFormat.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffSampleFormat.cs
index cdd618224c..81899c5fd8 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffSampleFormat.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffSampleFormat.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Specifies how to interpret each data sample in a pixel.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
index b66b72ce9a..280dc76eed 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
     /// Enumeration representing the sub-file types defined by the Tiff file-format.
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffThresholding.cs
similarity index 70%
rename from src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffThresholding.cs
index 9002df9788..fce0b175c8 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffThresholding.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Constants
 {
     /// <summary>
-    /// Enumeration representing the threshholding applied to image data defined by the Tiff file-format.
+    /// Enumeration representing the thresholding applied to image data defined by the Tiff file-format.
     /// </summary>
-    internal enum TiffThreshholding
+    internal enum TiffThresholding
     {
         /// <summary>
         /// No dithering or halftoning.
@@ -23,4 +23,4 @@ namespace SixLabors.ImageSharp.Formats.Tiff
         /// </summary>
         Random = 3
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs b/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs
index 3aedf422b4..b3e3d82ad8 100644
--- a/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs
+++ b/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs
@@ -2,6 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
+
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+using SixLabors.ImageSharp.Formats.Tiff.Streams;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 
 namespace SixLabors.ImageSharp.Formats.Tiff
diff --git a/src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs b/src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs
index 57d69b4a83..d05a6a9018 100644
--- a/src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs
+++ b/src/ImageSharp/Formats/Tiff/Ifd/EntryReader.cs
@@ -3,9 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
+
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+using SixLabors.ImageSharp.Formats.Tiff.Streams;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 
 namespace SixLabors.ImageSharp.Formats.Tiff
diff --git a/src/ImageSharp/Formats/Tiff/Streams/TiffBigEndianStream.cs b/src/ImageSharp/Formats/Tiff/Streams/TiffBigEndianStream.cs
index 1579370553..002177a91f 100644
--- a/src/ImageSharp/Formats/Tiff/Streams/TiffBigEndianStream.cs
+++ b/src/ImageSharp/Formats/Tiff/Streams/TiffBigEndianStream.cs
@@ -1,10 +1,12 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
 using System.IO;
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+
+namespace SixLabors.ImageSharp.Formats.Tiff.Streams
 {
     internal class TiffBigEndianStream : TiffStream
     {
diff --git a/src/ImageSharp/Formats/Tiff/Streams/TiffLittleEndianStream.cs b/src/ImageSharp/Formats/Tiff/Streams/TiffLittleEndianStream.cs
index da6b8b8efb..649e71e0ab 100644
--- a/src/ImageSharp/Formats/Tiff/Streams/TiffLittleEndianStream.cs
+++ b/src/ImageSharp/Formats/Tiff/Streams/TiffLittleEndianStream.cs
@@ -1,10 +1,12 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
 using System.IO;
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+
+namespace SixLabors.ImageSharp.Formats.Tiff.Streams
 {
     internal class TiffLittleEndianStream : TiffStream
     {
diff --git a/src/ImageSharp/Formats/Tiff/Streams/TiffStream.cs b/src/ImageSharp/Formats/Tiff/Streams/TiffStream.cs
index 0c62c01c32..af7bc0cd12 100644
--- a/src/ImageSharp/Formats/Tiff/Streams/TiffStream.cs
+++ b/src/ImageSharp/Formats/Tiff/Streams/TiffStream.cs
@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 
-namespace SixLabors.ImageSharp.Formats.Tiff
+namespace SixLabors.ImageSharp.Formats.Tiff.Streams
 {
     /// <summary>
     /// The tiff data stream base class.
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
index e3806ee543..4c9b0b48df 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
@@ -7,6 +7,8 @@ using System.Linq;
 using System.Threading;
 
 using SixLabors.ImageSharp.Formats.Tiff.Compression;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+using SixLabors.ImageSharp.Formats.Tiff.Streams;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs
index 751ecf09e5..4f45ba5d7a 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoderHelpers.cs
@@ -3,7 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+
 using SixLabors.ImageSharp.Formats.Tiff.Compression;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
diff --git a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
index 5e636c0975..995461c0f1 100644
--- a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Threading;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Formats.Tiff.Utils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
diff --git a/src/ImageSharp/Formats/Tiff/TiffFormat.cs b/src/ImageSharp/Formats/Tiff/TiffFormat.cs
index 0628ef530e..ffae320936 100644
--- a/src/ImageSharp/Formats/Tiff/TiffFormat.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffFormat.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+
 namespace SixLabors.ImageSharp.Formats.Tiff
 {
     /// <summary>
diff --git a/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs b/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
index 466702693d..6956fb16af 100644
--- a/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffFrameMetadata.cs
@@ -1,9 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 
 namespace SixLabors.ImageSharp.Formats.Tiff
diff --git a/src/ImageSharp/Formats/Tiff/TiffMetadata.cs b/src/ImageSharp/Formats/Tiff/TiffMetadata.cs
index fd1d84ef38..d72a903d8c 100644
--- a/src/ImageSharp/Formats/Tiff/TiffMetadata.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffMetadata.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
+
 namespace SixLabors.ImageSharp.Formats.Tiff
 {
     /// <summary>
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
index 5e04906bb5..0db1ad39d8 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -2,14 +2,16 @@
 // Licensed under the Apache License, Version 2.0.
 
 // ReSharper disable InconsistentNaming
-
 using System;
 using System.IO;
+
 using SixLabors.ImageSharp.Formats.Tiff;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Tiff
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
index 0090a82229..3df4b45cbb 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
@@ -2,8 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats.Tiff;
+using SixLabors.ImageSharp.Formats.Tiff.Constants;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Tiff