diff --git a/ICSharpCode.AvalonEdit/Folding/AbstractFoldingStrategy.cs b/ICSharpCode.AvalonEdit/Folding/AbstractFoldingStrategy.cs
deleted file mode 100644
index 599d68d..0000000
--- a/ICSharpCode.AvalonEdit/Folding/AbstractFoldingStrategy.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.AvalonEdit.Document;
-
-namespace ICSharpCode.AvalonEdit.Folding
-{
-	/// <summary>
-	/// Base class for folding strategies.
-	/// </summary>
-	public abstract class AbstractFoldingStrategy
-	{
-		/// <summary>
-		/// Create <see cref="NewFolding"/>s for the specified document and updates the folding manager with them.
-		/// </summary>
-		public void UpdateFoldings(FoldingManager manager, TextDocument document)
-		{
-			int firstErrorOffset;
-			IEnumerable<NewFolding> foldings = CreateNewFoldings(document, out firstErrorOffset);
-			manager.UpdateFoldings(foldings, firstErrorOffset);
-		}
-		
-		/// <summary>
-		/// Create <see cref="NewFolding"/>s for the specified document.
-		/// </summary>
-		public abstract IEnumerable<NewFolding> CreateNewFoldings(TextDocument document, out int firstErrorOffset);
-	}
-}
diff --git a/ICSharpCode.AvalonEdit/Folding/NewFolding.cs b/ICSharpCode.AvalonEdit/Folding/NewFolding.cs
index 6670073..4917941 100644
--- a/ICSharpCode.AvalonEdit/Folding/NewFolding.cs
+++ b/ICSharpCode.AvalonEdit/Folding/NewFolding.cs
@@ -31,6 +31,12 @@ namespace ICSharpCode.AvalonEdit.Folding
 		/// </summary>
 		public bool DefaultClosed { get; set; }
 		
+		/// <summary>
+		/// Gets/Sets whether the folding is considered to be a definition.
+		/// This has an effect on the 'Show Definitions only' command.
+		/// </summary>
+		public bool IsDefinition { get; set; }
+		
 		/// <summary>
 		/// Creates a new NewFolding instance.
 		/// </summary>
diff --git a/ICSharpCode.AvalonEdit/Folding/XmlFoldingStrategy.cs b/ICSharpCode.AvalonEdit/Folding/XmlFoldingStrategy.cs
index 5adaa2e..81becf4 100644
--- a/ICSharpCode.AvalonEdit/Folding/XmlFoldingStrategy.cs
+++ b/ICSharpCode.AvalonEdit/Folding/XmlFoldingStrategy.cs
@@ -22,7 +22,7 @@ namespace ICSharpCode.AvalonEdit.Folding
 	/// <summary>
 	/// Determines folds for an xml string in the editor.
 	/// </summary>
-	public class XmlFoldingStrategy : AbstractFoldingStrategy
+	public class XmlFoldingStrategy
 	{
 		/// <summary>
 		/// Flag indicating whether attributes should be displayed on folded
@@ -30,10 +30,20 @@ namespace ICSharpCode.AvalonEdit.Folding
 		/// </summary>
 		public bool ShowAttributesWhenFolded { get; set; }
 		
+		/// <summary>
+		/// Create <see cref="NewFolding"/>s for the specified document and updates the folding manager with them.
+		/// </summary>
+		public void UpdateFoldings(FoldingManager manager, TextDocument document)
+		{
+			int firstErrorOffset;
+			IEnumerable<NewFolding> foldings = CreateNewFoldings(document, out firstErrorOffset);
+			manager.UpdateFoldings(foldings, firstErrorOffset);
+		}
+		
 		/// <summary>
 		/// Create <see cref="NewFolding"/>s for the specified document.
 		/// </summary>
-		public override IEnumerable<NewFolding> CreateNewFoldings(TextDocument document, out int firstErrorOffset)
+		public IEnumerable<NewFolding> CreateNewFoldings(TextDocument document, out int firstErrorOffset)
 		{
 			try {
 				XmlTextReader reader = new XmlTextReader(document.CreateReader());
diff --git a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index 56d8ea7..7d336ec 100644
--- a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -150,7 +150,6 @@
     <Compile Include="Editing\ImeNativeWrapper.cs" />
     <Compile Include="Editing\SelectionSegment.cs" />
     <Compile Include="Editing\ImeSupport.cs" />
-    <Compile Include="Folding\AbstractFoldingStrategy.cs" />
     <Compile Include="Folding\FoldingElementGenerator.cs" />
     <Compile Include="Folding\FoldingManager.cs" />
     <Compile Include="Folding\FoldingMargin.cs" />