diff --git a/PInvoke/Shared/WinUser/MouseButtonState.cs b/PInvoke/Shared/WinUser/MouseButtonState.cs
new file mode 100644
index 00000000..128f57ae
--- /dev/null
+++ b/PInvoke/Shared/WinUser/MouseButtonState.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Vanara.PInvoke
+{
+	/// <summary>The state of the other mouse buttons plus the SHIFT and CTRL keys.</summary>
+	[PInvokeData("winuser.h")]
+	[Flags]
+	public enum MouseButtonState
+	{
+		/// <summary>The left mouse button is down.</summary>
+		MK_LBUTTON = 0x0001,
+
+		/// <summary>The right mouse button is down.</summary>
+		MK_RBUTTON = 0x0002,
+
+		/// <summary>The SHIFT key is down.</summary>
+		MK_SHIFT = 0x0004,
+
+		/// <summary>The CTRL key is down.</summary>
+		MK_CONTROL = 0x0008,
+
+		/// <summary>The middle mouse button is down.</summary>
+		MK_MBUTTON = 0x0010,
+
+		/// <summary>The XBUTTON1 button is down.</summary>
+		MK_XBUTTON1 = 0x0020,
+
+		/// <summary>The XBUTTON2 button is down.</summary>
+		MK_XBUTTON2 = 0x0040,
+	}
+}
\ No newline at end of file
diff --git a/PInvoke/Shell32/ShObjIdl.IExecuteCommand.cs b/PInvoke/Shell32/ShObjIdl.IExecuteCommand.cs
index 59e52486..1e3153b7 100644
--- a/PInvoke/Shell32/ShObjIdl.IExecuteCommand.cs
+++ b/PInvoke/Shell32/ShObjIdl.IExecuteCommand.cs
@@ -72,7 +72,7 @@ namespace Vanara.PInvoke
 			// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-iexecutecommand-setkeystate HRESULT
 			// SetKeyState( DWORD grfKeyState );
 			[PreserveSig]
-			HRESULT SetKeyState(User32.MouseButtonState grfKeyState);
+			HRESULT SetKeyState(MouseButtonState grfKeyState);
 
 			/// <summary>Provides parameter values for the verb.</summary>
 			/// <param name="pszParameters">
diff --git a/PInvoke/User32/WinUser.Mouse.cs b/PInvoke/User32/WinUser.Mouse.cs
index 6c99b2e1..fcd2687f 100644
--- a/PInvoke/User32/WinUser.Mouse.cs
+++ b/PInvoke/User32/WinUser.Mouse.cs
@@ -19,33 +19,6 @@ namespace Vanara.PInvoke
 			GMMP_USE_HIGH_RESOLUTION_POINTS = 2,
 		}
 
-		/// <summary>The state of the other mouse buttons plus the SHIFT and CTRL keys.</summary>
-		[PInvokeData("winuser.h")]
-		[Flags]
-		public enum MouseButtonState
-		{
-			/// <summary>The left mouse button is down.</summary>
-			MK_LBUTTON = 0x0001,
-
-			/// <summary>The right mouse button is down.</summary>
-			MK_RBUTTON = 0x0002,
-
-			/// <summary>The SHIFT key is down.</summary>
-			MK_SHIFT = 0x0004,
-
-			/// <summary>The CTRL key is down.</summary>
-			MK_CONTROL = 0x0008,
-
-			/// <summary>The middle mouse button is down.</summary>
-			MK_MBUTTON = 0x0010,
-
-			/// <summary>The XBUTTON1 button is down.</summary>
-			MK_XBUTTON1 = 0x0020,
-
-			/// <summary>The XBUTTON2 button is down.</summary>
-			MK_XBUTTON2 = 0x0040,
-		}
-
 		/// <summary>Controls various aspects of mouse motion and button clicking.</summary>
 		[PInvokeData("winuser.h", MSDNShortId = "")]
 		[Flags]
diff --git a/Windows.Shell/ShellExtensions/ShellExecuteCommand.cs b/Windows.Shell/ShellExtensions/ShellExecuteCommand.cs
index a1569e99..56a94d63 100644
--- a/Windows.Shell/ShellExtensions/ShellExecuteCommand.cs
+++ b/Windows.Shell/ShellExtensions/ShellExecuteCommand.cs
@@ -88,7 +88,7 @@ namespace Vanara.Windows.Shell
 
 		/// <summary>Gets a value based on the current state of the keys CTRL and SHIFT.</summary>
 		/// <value>The value based on the current state of the keys CTRL and SHIFT.</value>
-		public User32.MouseButtonState KeyState { get; private set; }
+		public MouseButtonState KeyState { get; private set; }
 
 		/// <summary>Gets a new working directory. This value is <see langword="null"/> if the current working directory is to be used.</summary>
 		/// <value>Returns a <see cref="string"/> value.</value>
@@ -149,7 +149,7 @@ namespace Vanara.Windows.Shell
 		}
 
 		/// <inheritdoc/>
-		HRESULT IExecuteCommand.SetKeyState(User32.MouseButtonState grfKeyState)
+		HRESULT IExecuteCommand.SetKeyState(MouseButtonState grfKeyState)
 		{
 			KeyState = grfKeyState;
 			return HRESULT.S_OK;