diff --git a/server/Windows/wf_info.c b/server/Windows/wf_info.c
index f70d24ce2..54839c7c7 100644
--- a/server/Windows/wf_info.c
+++ b/server/Windows/wf_info.c
@@ -136,10 +136,10 @@ wfInfo* wf_info_init()
 			_tprintf(_T("Failed to create update thread\n"));
 		}
 
-		wfi->peers = (freerdp_peer**) malloc(sizeof(freerdp_peer*) * 32);
+		wfi->peers = (freerdp_peer**) malloc(sizeof(freerdp_peer*) * WF_INFO_MAXPEERS);
 
 		//Set FPS
-		wfi->framesPerSecond = 24;
+		wfi->framesPerSecond = WF_INFO_DEFAULT_FPS;
 
 		status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\FreeRDP\\Server"), 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
 		if (status == ERROR_SUCCESS)
diff --git a/server/Windows/wf_info.h b/server/Windows/wf_info.h
index c23ad872b..ff26275e9 100644
--- a/server/Windows/wf_info.h
+++ b/server/Windows/wf_info.h
@@ -22,6 +22,9 @@
 
 #include "wf_interface.h"
 
+#define WF_INFO_DEFAULT_FPS 24
+#define WF_INFO_MAXPEERS 32
+
 int wf_info_lock(wfInfo* wfi);
 int wf_info_try_lock(wfInfo* wfi, DWORD dwMilliseconds);
 int wf_info_unlock(wfInfo* wfi);