diff --git a/lib/win_util.C b/lib/win_util.C
index fc145cdab9..4eb30aac2b 100644
--- a/lib/win_util.C
+++ b/lib/win_util.C
@@ -26,19 +26,30 @@
 #include "win_util.h"
 
 
-#define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \
-DESKTOP_CREATEMENU | DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | \
-DESKTOP_JOURNALPLAYBACK | DESKTOP_ENUMERATE | DESKTOP_WRITEOBJECTS | \
-DESKTOP_SWITCHDESKTOP | STANDARD_RIGHTS_REQUIRED)
+#define WINSTA_ALL ( \
+WINSTA_ACCESSCLIPBOARD  | WINSTA_ACCESSGLOBALATOMS | \
+WINSTA_CREATEDESKTOP    | WINSTA_ENUMDESKTOPS      | \
+WINSTA_ENUMERATE        | WINSTA_EXITWINDOWS       | \
+WINSTA_READATTRIBUTES   | WINSTA_READSCREEN        | \
+WINSTA_WRITEATTRIBUTES  | DELETE                   | \
+READ_CONTROL            | WRITE_DAC                | \
+WRITE_OWNER \
+)
 
-#define WINSTA_ALL (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | \
-WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | \
-WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \
-WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN | \
-STANDARD_RIGHTS_REQUIRED)
+#define DESKTOP_ALL ( \
+DESKTOP_CREATEMENU      | DESKTOP_CREATEWINDOW  | \
+DESKTOP_ENUMERATE       | DESKTOP_HOOKCONTROL   | \
+DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | \
+DESKTOP_READOBJECTS     | DESKTOP_SWITCHDESKTOP | \
+DESKTOP_WRITEOBJECTS    | DELETE                | \
+READ_CONTROL            | WRITE_DAC             | \
+WRITE_OWNER \
+)
 
-#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \
-GENERIC_EXECUTE | GENERIC_ALL)
+#define GENERIC_ACCESS ( \
+GENERIC_READ    | GENERIC_WRITE | \
+GENERIC_EXECUTE | GENERIC_ALL \
+)
 
 
 /**