diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
index 4f2ba3e4fb..66d3fdb3a7 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
@@ -104,8 +104,6 @@
     <Compile Include="Src\DataSource\ReflectionExtension.cs" />
     <Compile Include="Src\Exporter\BaseExporter.cs" />
     <Compile Include="Src\Exporter\DebugExporter.cs" />
-    <Compile Include="Src\Exporter\Visitors\CanvasExtension.cs" />
-    <Compile Include="Src\Exporter\Visitors\CanvasHelper.cs" />
     <Compile Include="Src\Exporter\Visitors\ExpressionVisitor.cs" />
     <Compile Include="Src\Exporter\Visitors\FormatVisitor.cs" />
     <Compile Include="Src\Exporter\Visitors\AbstractVisitor.cs" />
@@ -170,6 +168,8 @@
     <Compile Include="Src\Pdf\PdfVisitor.cs" />
     <Compile Include="Src\ReportingFactory.cs" />
     <Compile Include="Src\Wpf\PreviewViewModel.cs" />
+    <Compile Include="Src\Wpf\Visitor\CanvasExtension.cs" />
+    <Compile Include="Src\Wpf\Visitor\CanvasHelper.cs" />
     <Compile Include="Src\Wpf\Visitor\FixedDocumentCreator.cs" />
     <Compile Include="Src\Wpf\Visitor\Graphics\ExtendedLine.cs" />
     <Compile Include="Src\Wpf\Visitor\WpfExporter.cs" />
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasExtension.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasExtension.cs
similarity index 95%
rename from src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasExtension.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasExtension.cs
index 94e6f65970..3625587a00 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasExtension.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasExtension.cs
@@ -4,7 +4,7 @@ using System;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace ICSharpCode.Reporting.Exporter.Visitors
+namespace ICSharpCode.Reporting.WpfReportViewer.Visitor 
 {
 	/// <summary>
 	/// Description of CanvasExtension.
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasHelper.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasHelper.cs
similarity index 97%
rename from src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasHelper.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasHelper.cs
index 61574eee4e..66ac9f2dac 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/CanvasHelper.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/CanvasHelper.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Controls;
 
 
-namespace ICSharpCode.Reporting.Exporter.Visitors
+namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 {
 	/// <summary>
 	/// Description of CanvasHelper.