diff --git a/src/ImageSharp/Formats/Exr/ExrImageDataType.cs b/src/ImageSharp/Formats/Exr/Constants/ExrImageDataType.cs
similarity index 76%
rename from src/ImageSharp/Formats/Exr/ExrImageDataType.cs
rename to src/ImageSharp/Formats/Exr/Constants/ExrImageDataType.cs
index 92ca0f771b..d63a8e2198 100644
--- a/src/ImageSharp/Formats/Exr/ExrImageDataType.cs
+++ b/src/ImageSharp/Formats/Exr/Constants/ExrImageDataType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Exr;
+namespace SixLabors.ImageSharp.Formats.Exr.Constants;
 
 internal enum ExrImageDataType
 {
diff --git a/src/ImageSharp/Formats/Exr/ExrImageType.cs b/src/ImageSharp/Formats/Exr/Constants/ExrImageType.cs
similarity index 72%
rename from src/ImageSharp/Formats/Exr/ExrImageType.cs
rename to src/ImageSharp/Formats/Exr/Constants/ExrImageType.cs
index bae5e21777..beeabe35e1 100644
--- a/src/ImageSharp/Formats/Exr/ExrImageType.cs
+++ b/src/ImageSharp/Formats/Exr/Constants/ExrImageType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Exr;
+namespace SixLabors.ImageSharp.Formats.Exr.Constants;
 
 internal enum ExrImageType
 {
diff --git a/src/ImageSharp/Formats/Exr/ExrLineOrder.cs b/src/ImageSharp/Formats/Exr/Constants/ExrLineOrder.cs
similarity index 76%
rename from src/ImageSharp/Formats/Exr/ExrLineOrder.cs
rename to src/ImageSharp/Formats/Exr/Constants/ExrLineOrder.cs
index 8b9a6d7722..56573472ca 100644
--- a/src/ImageSharp/Formats/Exr/ExrLineOrder.cs
+++ b/src/ImageSharp/Formats/Exr/Constants/ExrLineOrder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Exr;
+namespace SixLabors.ImageSharp.Formats.Exr.Constants;
 
 internal enum ExrLineOrder : byte
 {
diff --git a/src/ImageSharp/Formats/Exr/ExrPixelType.cs b/src/ImageSharp/Formats/Exr/Constants/ExrPixelType.cs
similarity index 89%
rename from src/ImageSharp/Formats/Exr/ExrPixelType.cs
rename to src/ImageSharp/Formats/Exr/Constants/ExrPixelType.cs
index 7016063ecc..cddc43d594 100644
--- a/src/ImageSharp/Formats/Exr/ExrPixelType.cs
+++ b/src/ImageSharp/Formats/Exr/Constants/ExrPixelType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Exr;
+namespace SixLabors.ImageSharp.Formats.Exr.Constants;
 
 /// <summary>
 /// The different pixel formats for a OpenEXR image.
diff --git a/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs b/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
index 915b8201d9..d4f5825b99 100644
--- a/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
+++ b/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.Formats.Exr.Constants;
 
 namespace SixLabors.ImageSharp.Formats.Exr;
 
diff --git a/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs b/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
index c19436d523..38e9c3ec90 100644
--- a/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
+++ b/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
@@ -9,6 +9,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Text;
 using SixLabors.ImageSharp.Formats.Exr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Constants;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
diff --git a/src/ImageSharp/Formats/Exr/ExrEncoder.cs b/src/ImageSharp/Formats/Exr/ExrEncoder.cs
index 95913f2beb..15e10ba2fa 100644
--- a/src/ImageSharp/Formats/Exr/ExrEncoder.cs
+++ b/src/ImageSharp/Formats/Exr/ExrEncoder.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Formats.Exr.Constants;
+
 namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
diff --git a/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs b/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
index 98f43f6e27..400915d220 100644
--- a/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
+++ b/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
@@ -7,6 +7,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Channels;
 using SixLabors.ImageSharp.Formats.Exr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Constants;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs b/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
index 29c30e7935..35611bb6eb 100644
--- a/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
+++ b/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Formats.Exr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Constants;
 
 namespace SixLabors.ImageSharp.Formats.Exr;
 
diff --git a/src/ImageSharp/Formats/Exr/ExrMetadata.cs b/src/ImageSharp/Formats/Exr/ExrMetadata.cs
index 2e83826c96..552d2d1133 100644
--- a/src/ImageSharp/Formats/Exr/ExrMetadata.cs
+++ b/src/ImageSharp/Formats/Exr/ExrMetadata.cs
@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Numerics;
+using SixLabors.ImageSharp.Formats.Exr.Constants;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Exr;
diff --git a/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs b/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
index 0d90514e9c..2ccf26ec17 100644
--- a/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Formats.Exr.Constants;
+
 namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>