diff --git a/gfx/display_servers/dispserv_null.c b/gfx/display_servers/dispserv_null.c
index c40ef5bfc1..7974726cb4 100644
--- a/gfx/display_servers/dispserv_null.c
+++ b/gfx/display_servers/dispserv_null.c
@@ -15,6 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
 #include "../video_display_server.h"
 
 static void* null_display_server_init()
diff --git a/gfx/display_servers/dispserv_win32.c b/gfx/display_servers/dispserv_win32.c
index fb66660640..53e942eefc 100644
--- a/gfx/display_servers/dispserv_win32.c
+++ b/gfx/display_servers/dispserv_win32.c
@@ -26,7 +26,7 @@ typedef struct
 
 static void* win32_display_server_init()
 {
-   dispserv_win32_t *dispserv = calloc(1, sizeof(*dispserv));
+   dispserv_win32_t *dispserv = (dispserv_win32_t*)calloc(1, sizeof(*dispserv));
 
    return dispserv;
 }