diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
index 995d7a869..c02d6c5f1 100644
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -1,26 +1,27 @@
-option(WITH_DEBUG_TRANSPORT "Print transport debug messages." OFF)
-option(WITH_DEBUG_CHANNELS "Print channel manager debug messages." OFF)
-option(WITH_DEBUG_SVC "Print static virtual channel debug messages." OFF)
-option(WITH_DEBUG_DVC "Print dynamic virtual channel debug messages." OFF)
-option(WITH_DEBUG_KBD "Print keyboard related debug messages." OFF)
-option(WITH_DEBUG_NLA "Print authentication related debug messages." OFF)
-option(WITH_DEBUG_NEGO "Print negotiation related debug messages." OFF)
+option(WITH_MANPAGES "Generate manpages." ON)
+option(WITH_NEON "Enable NEON optimization for rfx decoder" OFF)
+option(WITH_PROFILER "Compile profiler." OFF)
+option(WITH_SSE2_TARGET "Allow compiler to generate SSE2 instructions." OFF)
+option(WITH_SSE2 "Use SSE2 optimization." OFF)
+
 option(WITH_DEBUG_CERTIFICATE "Print certificate related debug messages." OFF)
-option(WITH_DEBUG_LICENSE "Print license debug messages." OFF)
+option(WITH_DEBUG_CHANNELS "Print channel manager debug messages." OFF)
+option(WITH_DEBUG_CLIPRDR "Print clipboard redirection debug messages" OFF)
+option(WITH_DEBUG_DVC "Print dynamic virtual channel debug messages." OFF)
 option(WITH_DEBUG_GDI "Print graphics debug messages." OFF)
+option(WITH_DEBUG_KBD "Print keyboard related debug messages." OFF)
+option(WITH_DEBUG_LICENSE "Print license debug messages." OFF)
+option(WITH_DEBUG_NEGO "Print negotiation related debug messages." OFF)
+option(WITH_DEBUG_NLA "Print authentication related debug messages." OFF)
+option(WITH_DEBUG_ORDERS "Print drawing orders debug messages" OFF)
+option(WITH_DEBUG_RAIL "Print RemoteApp debug messages" OFF)
+option(WITH_DEBUG_REDIR "Redirection debug messages" OFF)
 option(WITH_DEBUG_RFX "Print RemoteFX debug messages." OFF)
-option(WITH_DEBUG_X11 "Print X11 Client debug messages" OFF)
+option(WITH_DEBUG_SCARD "Print smartcard debug messages" OFF)
+option(WITH_DEBUG_SVC "Print static virtual channel debug messages." OFF)
+option(WITH_DEBUG_TRANSPORT "Print transport debug messages." OFF)
+option(WITH_DEBUG_WND "Print window order debug messages" OFF)
 option(WITH_DEBUG_X11_CLIPRDR "Print X11 clipboard redirection debug messages" OFF)
 option(WITH_DEBUG_X11_LOCAL_MOVESIZE "Print X11 Client local movesize debug messages" OFF)
-option(WITH_DEBUG_RAIL "Print RemoteApp debug messages" OFF)
+option(WITH_DEBUG_X11 "Print X11 Client debug messages" OFF)
 option(WITH_DEBUG_XV "Print XVideo debug messages" OFF)
-option(WITH_DEBUG_SCARD "Print smartcard debug messages" OFF)
-option(WITH_DEBUG_ORDERS "Print drawing orders debug messages" OFF)
-option(WITH_MANPAGES "Generate manpages." ON)
-option(WITH_PROFILER "Compile profiler." OFF)
-option(WITH_SSE2 "Use SSE2 optimization." OFF)
-option(WITH_SSE2_TARGET "Allow compiler to generate SSE2 instructions." OFF)
-option(WITH_DEBUG_REDIR "Redirection debug messages" OFF)
-option(WITH_DEBUG_CLIPRDR "Print clipboard redirection debug messages" OFF)
-option(WITH_DEBUG_WND "Print window order debug messages" OFF)
-option(WITH_NEON "Enable NEON optimization for rfx decoder" OFF)
diff --git a/config.h.in b/config.h.in
index 89399791d..d258bb2ad 100644
--- a/config.h.in
+++ b/config.h.in
@@ -28,30 +28,32 @@
 #cmakedefine BIG_ENDIAN
 
 /* Options */
-#cmakedefine WITH_DEBUG_TRANSPORT
-#cmakedefine WITH_DEBUG_CHANNELS
-#cmakedefine WITH_DEBUG_SVC
-#cmakedefine WITH_DEBUG_DVC
-#cmakedefine WITH_DEBUG_KBD
-#cmakedefine WITH_DEBUG_NLA
-#cmakedefine WITH_DEBUG_NEGO
-#cmakedefine WITH_DEBUG_CERTIFICATE
-#cmakedefine WITH_DEBUG_LICENSE
-#cmakedefine WITH_DEBUG_GDI
-#cmakedefine WITH_DEBUG_ASSERT
-#cmakedefine WITH_DEBUG_RFX
 #cmakedefine WITH_PROFILER
 #cmakedefine WITH_SSE2
 #cmakedefine WITH_SSE2_TARGET
 #cmakedefine WITH_NEON
+
+/* Debug */
+#cmakedefine WITH_DEBUG_ASSERT
+#cmakedefine WITH_DEBUG_CERTIFICATE
+#cmakedefine WITH_DEBUG_CHANNELS
+#cmakedefine WITH_DEBUG_CLIPRDR
+#cmakedefine WITH_DEBUG_DVC
+#cmakedefine WITH_DEBUG_GDI
+#cmakedefine WITH_DEBUG_KBD
+#cmakedefine WITH_DEBUG_LICENSE
+#cmakedefine WITH_DEBUG_NEGO
+#cmakedefine WITH_DEBUG_NLA
+#cmakedefine WITH_DEBUG_ORDERS
+#cmakedefine WITH_DEBUG_RAIL
+#cmakedefine WITH_DEBUG_REDIR
+#cmakedefine WITH_DEBUG_RFX
+#cmakedefine WITH_DEBUG_SCARD
+#cmakedefine WITH_DEBUG_SVC
+#cmakedefine WITH_DEBUG_TRANSPORT
+#cmakedefine WITH_DEBUG_WND
 #cmakedefine WITH_DEBUG_X11
 #cmakedefine WITH_DEBUG_X11_CLIPRDR
 #cmakedefine WITH_DEBUG_X11_LOCAL_MOVESIZE
-#cmakedefine WITH_DEBUG_RAIL
 #cmakedefine WITH_DEBUG_XV
-#cmakedefine WITH_DEBUG_SCARD
-#cmakedefine WITH_DEBUG_ORDERS
-#cmakedefine WITH_DEBUG_REDIR
-#cmakedefine WITH_DEBUG_CLIPRDR
-#cmakedefine WITH_DEBUG_WND
 #endif