diff --git a/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.Roslyn4.0.cs b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.Roslyn4.0.cs
new file mode 100644
index 0000000000..5bb7553f89
--- /dev/null
+++ b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.Roslyn4.0.cs
@@ -0,0 +1,16 @@
+#if !ROSLYN4_4_OR_GREATER
+using Microsoft.CodeAnalysis;
+
+namespace Riok.Mapperly.Helpers;
+
+internal static partial class IncrementalValuesProviderExtensions
+{
+    public static IncrementalValueProvider<TSource> WithTrackingName<TSource>(this IncrementalValueProvider<TSource> source, string name) =>
+        source;
+
+    public static IncrementalValuesProvider<TSource> WithTrackingName<TSource>(
+        this IncrementalValuesProvider<TSource> source,
+        string name
+    ) => source;
+}
+#endif
diff --git a/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs
index 7a5a3196e2..6a8c4e3f77 100644
--- a/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs
+++ b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs
@@ -5,7 +5,7 @@
 
 namespace Riok.Mapperly.Helpers;
 
-internal static class IncrementalValuesProviderExtensions
+internal static partial class IncrementalValuesProviderExtensions
 {
     public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
         where TSource : struct
@@ -15,6 +15,13 @@ public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this Incr
 #nullable enable
     }
 
+    public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
+    {
+#nullable disable
+        return source.Where(x => x != null);
+#nullable enable
+    }
+
     /// <summary>
     /// Registers an output node into an <see cref="IncrementalGeneratorInitializationContext"/> to output a diagnostic.
     /// </summary>
@@ -69,21 +76,4 @@ IncrementalValuesProvider<MapperNode> mappers
             }
         );
     }
-
-#if !ROSLYN4_4_OR_GREATER
-    public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
-    {
-#nullable disable
-        return source.Where(x => x != null);
-#nullable enable
-    }
-
-    public static IncrementalValueProvider<TSource> WithTrackingName<TSource>(this IncrementalValueProvider<TSource> source, string name) =>
-        source;
-
-    public static IncrementalValuesProvider<TSource> WithTrackingName<TSource>(
-        this IncrementalValuesProvider<TSource> source,
-        string name
-    ) => source;
-#endif
 }
diff --git a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.4.props b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.4.props
index d3f7cc4ea9..46f2c18b28 100644
--- a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.4.props
+++ b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.4.props
@@ -1,9 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.5.props b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.5.props
index 4293f3c10b..9c35ee0a87 100644
--- a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.5.props
+++ b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.5.props
@@ -1,9 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.7.props b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.7.props
index c99d945a48..49d9935caa 100644
--- a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.7.props
+++ b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.7.props
@@ -1,10 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
-    <DefineConstants>$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Riok.Mapperly/Riok.Mapperly.csproj b/src/Riok.Mapperly/Riok.Mapperly.csproj
index da0017ec00..a8f33cbf36 100644
--- a/src/Riok.Mapperly/Riok.Mapperly.csproj
+++ b/src/Riok.Mapperly/Riok.Mapperly.csproj
@@ -16,8 +16,10 @@
     <PackageTags>Mapper SourceGenerator</PackageTags>
     <PackageIcon>logo.png</PackageIcon>
 
-    <!-- default roslyn version -->
+    <!-- default roslyn version and constants -->
     <ROSLYN_VERSION Condition="'$(ROSLYN_VERSION)' == ''">4.7</ROSLYN_VERSION>
+    <DefineConstants Condition="$(ROSLYN_VERSION) >= 4.4">$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
+    <DefineConstants Condition="$(ROSLYN_VERSION) >= 4.7">$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
   </PropertyGroup>
 
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0 AND '$(CI)' == ''">