diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h
index 6b89a0dc..41c4a5ee 100644
--- a/common/xrdp_constants.h
+++ b/common/xrdp_constants.h
@@ -290,6 +290,18 @@
 #define RDP_CAPSET_FRAME_ACKNOWLEDGE   0x001E
 #define RDP_CAPLEN_FRAME_ACKNOWLEDGE   0x08
 
+#define RDP_CAPSET_SURFCMDS            0x1C
+#define RDP_CAPLEN_SURFCMDS            0x0C
+
+#define RDP_CAPSET_BMPCODECS           0x1D
+#define RDP_CAPLEN_BMPCODECS           0x1C
+
+#define RDP_CAPSET_COMPDESK            0x19
+#define RDP_CAPLEN_COMPDESK            0x06
+
+#define RDP_CAPSET_LPOINTER            0x1B
+#define RDP_CAPLEN_LPOINTER            0x06
+
 #define RDP_SOURCE                     "MSTSC"
 
 /* Logon flags */
@@ -573,15 +585,6 @@
 #define XR_CODEC_GUID_H264 \
   "\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"
 
-#define RDP_CAPSET_SURFCMDS       0x1C
-#define RDP_CAPLEN_SURFCMDS       0x0C
-#define RDP_CAPSET_BMPCODECS      0x1D
-#define RDP_CAPLEN_BMPCODECS      0x1C
-#define RDP_CAPSET_COMPDESK       0x19
-#define RDP_CAPLEN_COMPDESK       0x06
-#define RDP_CAPSET_LPOINTER       0x1B
-#define RDP_CAPLEN_LPOINTER       0x06
-
 /* fastpath input */
 #define FASTPATH_INPUT_SECURE_CHECKSUM 0x1
 #define FASTPATH_INPUT_ENCRYPTED       0x2