diff --git a/src/filesystem/cocoa/SDL_sysfilesystem.m b/src/filesystem/cocoa/SDL_sysfilesystem.m
index 3c4597455..3cf8878dd 100644
--- a/src/filesystem/cocoa/SDL_sysfilesystem.m
+++ b/src/filesystem/cocoa/SDL_sysfilesystem.m
@@ -27,6 +27,7 @@
 
 #include <Cocoa/Cocoa.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
diff --git a/src/filesystem/unix/SDL_sysfilesystem.c b/src/filesystem/unix/SDL_sysfilesystem.c
index 326637e78..09db1e55c 100644
--- a/src/filesystem/unix/SDL_sysfilesystem.c
+++ b/src/filesystem/unix/SDL_sysfilesystem.c
@@ -26,12 +26,15 @@
 /* System dependent filesystem routines                                */
 
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
 #include "SDL_filesystem.h"
 
-static char *readSymLink(const char *path)
+static char *
+readSymLink(const char *path)
 {
     char *retval = NULL;
     ssize_t len = 64;
@@ -71,7 +74,7 @@ SDL_GetBasePath(void)
     char *retval = NULL;
 
     /* is a Linux-style /proc filesystem available? */
-    if (access("/proc", F_OK) {
+    if (access("/proc", F_OK) == 0) {
         retval = readSymLink("/proc/self/exe");
         if (retval == NULL) {
             /* older kernels don't have /proc/self ... try PID version... */
diff --git a/src/filesystem/windows/SDL_sysfilesystem.c b/src/filesystem/windows/SDL_sysfilesystem.c
index fc17d5e0f..e55be7e6f 100644
--- a/src/filesystem/windows/SDL_sysfilesystem.c
+++ b/src/filesystem/windows/SDL_sysfilesystem.c
@@ -26,7 +26,7 @@
 /* System dependent filesystem routines                                */
 
 #include "SDL_error.h"
-#include "SDL_windows.h"
+#include "../../core/windows/SDL_windows.h"
 #include "SDL_stdinc.h"
 #include "SDL_filesystem.h"