diff --git a/src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs b/src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs
new file mode 100644
index 0000000000..984b145e68
--- /dev/null
+++ b/src/Avalonia.Styling/Diagnostics/StyleDiagnostics.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Avalonia.Styling;
+
+namespace Avalonia.Diagnostics
+{
+    /// <summary>
+    /// Contains information about style related diagnostics of a control.
+    /// </summary>
+    public class StyleDiagnostics
+    {
+        /// <summary>
+        /// Currently applied styles.
+        /// </summary>
+        public IReadOnlyList<IStyleInstance> AppliedStyles { get; }
+
+        public StyleDiagnostics(IReadOnlyList<IStyleInstance> appliedStyles)
+        {
+            AppliedStyles = appliedStyles;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs b/src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs
new file mode 100644
index 0000000000..d7bcc1aa47
--- /dev/null
+++ b/src/Avalonia.Styling/Diagnostics/StyledElementExtensions.cs
@@ -0,0 +1,17 @@
+namespace Avalonia.Diagnostics
+{
+    /// <summary>
+    /// Defines diagnostic extensions on <see cref="StyledElement"/>s.
+    /// </summary>
+    public static class StyledElementExtensions
+    {
+        /// <summary>
+        /// Gets a style diagnostics for a <see cref="StyledElement"/>.
+        /// </summary>
+        /// <param name="styledElement">The element.</param>
+        public static StyleDiagnostics GetStyleDiagnostics(this StyledElement styledElement)
+        {
+            return styledElement.GetStyleDiagnosticsInternal();
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index 2f7ec13775..fad281244f 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -16,24 +16,6 @@ using Avalonia.Styling;
 
 namespace Avalonia
 {
-    public class StyleDiagnostics
-    {
-        public IReadOnlyList<IStyleInstance> AppliedStyles { get; }
-
-        public StyleDiagnostics(IReadOnlyList<IStyleInstance> appliedStyles)
-        {
-            AppliedStyles = appliedStyles;
-        }
-    }
-
-    public static class StyledElementExtensions
-    {
-        public static StyleDiagnostics GetStyleDiagnostics(this StyledElement styledElement)
-        {
-            return styledElement.GetStyleDiagnosticsInternal();
-        }
-    }
-
     /// <summary>
     /// Extends an <see cref="Animatable"/> with the following features:
     /// 
diff --git a/src/Avalonia.Styling/Styling/IStyleInstance.cs b/src/Avalonia.Styling/Styling/IStyleInstance.cs
index cdccc552a3..8ddb989bc0 100644
--- a/src/Avalonia.Styling/Styling/IStyleInstance.cs
+++ b/src/Avalonia.Styling/Styling/IStyleInstance.cs
@@ -14,6 +14,9 @@ namespace Avalonia.Styling
         /// </summary>
         IStyle Source { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether this style is active.
+        /// </summary>
         bool IsActive { get; }
 
         /// <summary>