diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs
index 7a15c6e965..0ac8562277 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.Reporting.DataSource
 	/// <summary>
 	/// Description of DataCollection.
 	/// </summary>
-	internal class DataCollection<T> : IList<T>,ITypedList
+	class DataCollection<T> : IList<T>,ITypedList
 	{
 		Collection<T> list = new Collection<T>();
 		Type elementType;
@@ -197,7 +197,7 @@ namespace ICSharpCode.Reporting.DataSource
 		}
 		
 		[DebuggerStepThrough]
-		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		IEnumerator System.Collections.IEnumerable.GetEnumerator()
 		{
 			return list.GetEnumerator();
 		}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs
index 3ce56dff2e..efa48ddbac 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs
@@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.DataSource
 	/// <summary>
 	/// Description of ExtendedPropertyDescriptor.
 	/// </summary>
-	internal class ExtendedPropertyDescriptor : PropertyDescriptor
+	class ExtendedPropertyDescriptor : PropertyDescriptor
 	{
 	
 		Type componentType;
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs
index 5a19164ba3..455d3a69cb 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs
@@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.DataSource
 	/// <summary>
 	/// Description of ExtendedTypeDescriptor.
 	/// </summary>
-	internal class ExtendedTypeDescriptor
+	class ExtendedTypeDescriptor
 	{
 		private static Hashtable collections = new Hashtable();
 
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs
index e0369d5293..5565ac37e6 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.Reporting.DataSource
 	/// <summary>
 	/// Description of PropertyTypeHash.
 	/// </summary>
-	internal class PropertyTypeHash
+	class PropertyTypeHash
 	{
 		static PropertyTypeHash instance = new PropertyTypeHash();
 
@@ -46,7 +46,7 @@ namespace ICSharpCode.Reporting.DataSource
 			}
 		}
 
-		private PropertyTypeHash()
+		PropertyTypeHash()
 		{
 		}
 	}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs
index 5f38cfeee3..53149014d9 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs
@@ -12,7 +12,8 @@ using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-using ICSharpCode.Reporting.Exporter.Visitors;
+using ICSharpCode.Reporting.Interfaces;
+using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.Items;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 using Brush = System.Windows.Media.Brush;
@@ -25,7 +26,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
 	/// <summary>
 	/// Description of FixedDocumentCreator.
 	/// </summary>
-	internal class FixedDocumentCreator
+	class FixedDocumentCreator
 	{
 		BrushConverter brushConverter ;
 		ReportSettings reportSettings;
@@ -54,7 +55,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
 			
 			canvas.Measure(size);
 			
-			canvas.Arrange(new Rect(new System.Windows.Point(),size ));
+			canvas.Arrange(new Rect(new Point(),size ));
 
 			canvas.UpdateLayout();
 			
@@ -103,24 +104,26 @@ namespace ICSharpCode.Reporting.ExportRenderer
 		}
 		
 		void SetPositionAndSize(FrameworkElement element,ExportColumn column) {
+			if (column == null)
+				throw new ArgumentNullException("column");
 			SetPosition(element,column);
 			SetDimension(element,column);	
 		}
 		
-		static void SetDimension (FrameworkElement element,ExportColumn exportColumn)
+		static void SetDimension (FrameworkElement element,IExportColumn exportColumn)
 		{
 			element.Width = exportColumn.DesiredSize.Width;
 			element.Height = exportColumn.DesiredSize.Height;
 		}
 		
 		
-		static void SetPosition (FrameworkElement element,ExportColumn exportColumn) {
+		static void SetPosition (UIElement element,IExportColumn exportColumn) {
 			FixedPage.SetLeft(element,exportColumn.Location.X );
 			FixedPage.SetTop(element,exportColumn.Location.Y);
 		}
 		
 		
-		void SetFont(TextBlock textBlock,ExportText exportText)
+		void SetFont(TextBlock textBlock,IExportText exportText)
 		{
 			textBlock.FontFamily = new FontFamily(exportText.Font.FontFamily.Name);
 		
@@ -134,7 +137,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
 			}
 			
 			if (exportText.Font.Italic) {
-				textBlock.FontStyle = System.Windows.FontStyles.Italic ;
+				textBlock.FontStyle = FontStyles.Italic ;
 			}
 			if (exportText.Font.Strikeout) {
 				CreateStrikeout(textBlock,exportText);
@@ -142,8 +145,12 @@ namespace ICSharpCode.Reporting.ExportRenderer
 		}
 		
 		
-		void CreateStrikeout (TextBlock textBlock,ExportColumn exportColumn )
+		void CreateStrikeout (TextBlock textBlock,IExportText exportColumn )
 		{
+			if (textBlock == null)
+				throw new ArgumentNullException("textBlock");
+			if (exportColumn == null)
+				throw new ArgumentNullException("exportColumn");
 			var strikeOut = new TextDecoration();
 			strikeOut.Location = TextDecorationLocation.Strikethrough;
 
@@ -154,8 +161,12 @@ namespace ICSharpCode.Reporting.ExportRenderer
 		}
 		
 		
-		void CreateUnderline(TextBlock textBlock,ExportColumn exportColumn)
+		void CreateUnderline(TextBlock textBlock,IExportText exportColumn)
 		{
+			if (exportColumn == null)
+				throw new ArgumentNullException("exportColumn");
+			if (textBlock == null)
+				throw new ArgumentNullException("textBlock");
 			var underLine = new TextDecoration();
 			Pen p = CreateWpfPen(exportColumn);
 			underLine.Pen = p ;
@@ -164,8 +175,10 @@ namespace ICSharpCode.Reporting.ExportRenderer
 		}
 		
 		
-		Pen CreateWpfPen(ICSharpCode.Reporting.Interfaces.IReportObject exportColumn)
+		Pen CreateWpfPen(IReportObject exportColumn)
 		{
+			if (exportColumn == null)
+				throw new ArgumentNullException("exportColumn");
 			var myPen = new Pen();
 			myPen.Brush = ConvertBrush(exportColumn.ForeColor);
 			myPen.Thickness = 1.5;
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
index 7903329290..63f41ee966 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
@@ -27,8 +27,8 @@ namespace ICSharpCode.Reporting.Exporter
 	{
 		
 
-		private WpfVisitor visitor;
-		private ReportSettings reportSettings;
+		WpfVisitor visitor;
+		ReportSettings reportSettings;
 		FixedPage fixedPage;
 		
 		public WpfExporter(ReportSettings reportSettings,Collection<ExportPage> pages):base(pages)
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs
index e882634c28..35d5adc246 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer
 	public class PreviewViewModel:INotifyPropertyChanged
 	{
 		
-		private FixedDocument document ;
+		FixedDocument document ;
 		
 		public PreviewViewModel(ReportSettings reportSettings, Collection<ExportPage> pages)
 		{