diff --git a/UnitsNet/IArithmeticQuantity.cs b/UnitsNet/IArithmeticQuantity.cs
index bd044b2070..0e14ce6350 100644
--- a/UnitsNet/IArithmeticQuantity.cs
+++ b/UnitsNet/IArithmeticQuantity.cs
@@ -1,69 +1,14 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
-#if NET
+#if NET7_0_OR_GREATER
 using System.Numerics;
 #endif
 
 namespace UnitsNet;
 
 /// <summary>
-///     Represents a quantity that has both magnitude and direction, supporting various arithmetic operations and
-///     comparisons.
-/// </summary>
-/// <remarks>
-///     This interface defines standard linear arithmetic operations such as addition, subtraction, multiplication, and
-///     division.
-///     These types of quantities naturally support comparison operations with either absolute or relative tolerance, which
-///     is useful for determining equality within a certain margin of error.
-///     <para>
-///         For more information, see the Wikipedia page on
-///         <a href="https://en.wikipedia.org/wiki/Dimensional_analysis#Geometry:_position_vs._displacement">
-///             Dimensional
-///             Analysis
-///         </a>
-///         .
-///     </para>
-/// </remarks>
-/// <typeparam name="TSelf">The type that implements this interface.</typeparam>
-public interface ILinearQuantity<TSelf> : IQuantityOfType<TSelf>, IArithmeticQuantity<TSelf>
-#if NET7_0_OR_GREATER
-    , IAdditiveIdentity<TSelf, TSelf>
-#endif
-    where TSelf : ILinearQuantity<TSelf>
-{
-#if NET7_0_OR_GREATER
-    /// <summary>
-    ///     The zero value of this quantity.
-    /// </summary>
-    static abstract TSelf Zero { get; }
-
-    static TSelf IAdditiveIdentity<TSelf, TSelf>.AdditiveIdentity
-    {
-        get => TSelf.Zero;
-    }
-
-#endif
-}
-
-/// <summary>
-///     An <see cref="ILinearQuantity{TSelf}" /> with a strongly typed unit enum.
-/// </summary>
-/// <remarks>
-///     This interface represents linear quantities with known unit enum types, and (in .NET 7+) implements generic math
-///     interfaces for arithmetic operations.
-/// </remarks>
-/// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
-/// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-public interface ILinearQuantity<TSelf, TUnitType> : IArithmeticQuantity<TSelf, TUnitType>, ILinearQuantity<TSelf>
-    where TSelf : ILinearQuantity<TSelf, TUnitType>
-    where TUnitType : struct, Enum
-{
-}
-
-/// <summary>
-///     An <see cref="IQuantity{TSelf, TUnitType}" /> that (in .NET 7+) implements generic math interfaces for arithmetic
-///     operations.
+///     A quantity that (in .NET 7+) implements generic math interfaces for arithmetic operations.
 /// </summary>
 /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
 /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
diff --git a/UnitsNet/ILinearQuantity.cs b/UnitsNet/ILinearQuantity.cs
new file mode 100644
index 0000000000..983319f2b3
--- /dev/null
+++ b/UnitsNet/ILinearQuantity.cs
@@ -0,0 +1,62 @@
+// Licensed under MIT No Attribution, see LICENSE file at the root.
+// Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
+
+#if NET7_0_OR_GREATER
+using System.Numerics;
+#endif
+
+namespace UnitsNet;
+
+/// <summary>
+///     An <see cref="ILinearQuantity{TSelf}" /> with a strongly typed unit enum.
+/// </summary>
+/// <remarks>
+///     This interface represents linear quantities with known unit enum types, and (in .NET 7+) implements generic math
+///     interfaces for arithmetic operations.
+/// </remarks>
+/// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
+/// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
+public interface ILinearQuantity<TSelf, TUnitType> : IArithmeticQuantity<TSelf, TUnitType>, ILinearQuantity<TSelf>
+    where TSelf : ILinearQuantity<TSelf, TUnitType>
+    where TUnitType : struct, Enum
+{
+}
+
+/// <summary>
+///     Represents a quantity that has both magnitude and direction, supporting various arithmetic operations and
+///     comparisons.
+/// </summary>
+/// <remarks>
+///     This interface defines standard linear arithmetic operations such as addition, subtraction, multiplication, and
+///     division.
+///     These types of quantities naturally support comparison operations with either absolute or relative tolerance, which
+///     is useful for determining equality within a certain margin of error.
+///     <para>
+///         For more information, see the Wikipedia page on
+///         <a href="https://en.wikipedia.org/wiki/Dimensional_analysis#Geometry:_position_vs._displacement">
+///             Dimensional
+///             Analysis
+///         </a>
+///         .
+///     </para>
+/// </remarks>
+/// <typeparam name="TSelf">The type that implements this interface.</typeparam>
+public interface ILinearQuantity<TSelf> : IQuantityOfType<TSelf>, IArithmeticQuantity<TSelf>
+#if NET7_0_OR_GREATER
+    , IAdditiveIdentity<TSelf, TSelf>
+#endif
+    where TSelf : ILinearQuantity<TSelf>
+{
+#if NET7_0_OR_GREATER
+    /// <summary>
+    ///     The zero value of this quantity.
+    /// </summary>
+    static abstract TSelf Zero { get; }
+
+    static TSelf IAdditiveIdentity<TSelf, TSelf>.AdditiveIdentity
+    {
+        get => TSelf.Zero;
+    }
+
+#endif
+}
diff --git a/UnitsNet/ILogarithmicQuantity.cs b/UnitsNet/ILogarithmicQuantity.cs
index d350e5961c..e6d4b8d5a5 100644
--- a/UnitsNet/ILogarithmicQuantity.cs
+++ b/UnitsNet/ILogarithmicQuantity.cs
@@ -10,7 +10,7 @@ namespace UnitsNet;
 /// <inheritdoc cref="ILogarithmicQuantity{TSelf}"/>
 /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
 /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-public interface ILogarithmicQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnitType>, ILogarithmicQuantity<TSelf>
+public interface ILogarithmicQuantity<TSelf, TUnitType> : IArithmeticQuantity<TSelf, TUnitType>, ILogarithmicQuantity<TSelf>
     where TSelf : ILogarithmicQuantity<TSelf, TUnitType>
     where TUnitType : struct, Enum
 {