diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index b7a5cab894..ae7376df83 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -29,7 +29,7 @@
 #include <android/native_window.h>
 #include "../video/android/SDL_androidvideo.h"
 #endif
-#if SDL_VIDEO_DRIVER_RPI
+#ifdef SDL_VIDEO_DRIVER_RPI
 #include <unistd.h>
 #endif
 #if SDL_VIDEO_VITA_PVR_OGL
@@ -58,7 +58,7 @@
 #define EGL_PRESENT_OPAQUE_EXT 0x31DF
 #endif /* EGL_EXT_present_opaque */
 
-#if SDL_VIDEO_DRIVER_RPI
+#if defined(SDL_VIDEO_DRIVER_RPI)
 /* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
 #define DEFAULT_EGL        (vc4 ? "libEGL.so.1" : "libbrcmEGL.so")
 #define DEFAULT_OGL_ES2    (vc4 ? "libGLESv2.so.2" : "libbrcmGLESv2.so")
@@ -304,7 +304,7 @@ static int SDL_EGL_LoadLibraryInternal(_THIS, const char *egl_path)
 #if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_WINRT)
     const char *d3dcompiler;
 #endif
-#if SDL_VIDEO_DRIVER_RPI
+#if defined(SDL_VIDEO_DRIVER_RPI)
     SDL_bool vc4 = (0 == access("/sys/module/vc4/", F_OK));
 #endif
 
@@ -425,7 +425,7 @@ static int SDL_EGL_LoadLibraryInternal(_THIS, const char *egl_path)
 #endif
 
     _this->egl_data->egl_dll_handle = egl_dll_handle;
-#if SDL_VIDEO_DRIVER_VITA
+#if defined(SDL_VIDEO_DRIVER_VITA)
     _this->egl_data->opengl_dll_handle = opengl_dll_handle;
 #endif
 
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 78596ea5f3..052af12359 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -109,7 +109,7 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_RISCOS
     &RISCOS_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_RPI
+#ifdef SDL_VIDEO_DRIVER_RPI
     &RPI_bootstrap,
 #endif
 #if SDL_VIDEO_DRIVER_EMSCRIPTEN
diff --git a/src/video/raspberry/SDL_rpievents.c b/src/video/raspberry/SDL_rpievents.c
index 168dd07994..5b1638e95d 100644
--- a/src/video/raspberry/SDL_rpievents.c
+++ b/src/video/raspberry/SDL_rpievents.c
@@ -21,7 +21,7 @@
 
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_RPI
+#ifdef SDL_VIDEO_DRIVER_RPI
 
 #include "../../events/SDL_events_c.h"
 #include "../../events/SDL_keyboard_c.h"
diff --git a/src/video/raspberry/SDL_rpimouse.c b/src/video/raspberry/SDL_rpimouse.c
index 40d74752a4..6380d8f3f5 100644
--- a/src/video/raspberry/SDL_rpimouse.c
+++ b/src/video/raspberry/SDL_rpimouse.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_RPI
+#ifdef SDL_VIDEO_DRIVER_RPI
 
 #include "SDL_rpivideo.h"
 #include "SDL_rpimouse.h"
diff --git a/src/video/raspberry/SDL_rpiopengles.c b/src/video/raspberry/SDL_rpiopengles.c
index 18446ecef0..ec95b0002c 100644
--- a/src/video/raspberry/SDL_rpiopengles.c
+++ b/src/video/raspberry/SDL_rpiopengles.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+#if defined(SDL_VIDEO_DRIVER_RPI) && SDL_VIDEO_OPENGL_EGL
 
 #include "SDL_rpivideo.h"
 #include "SDL_rpiopengles.h"
diff --git a/src/video/raspberry/SDL_rpiopengles.h b/src/video/raspberry/SDL_rpiopengles.h
index 2b74986bd1..7c4bd46bc1 100644
--- a/src/video/raspberry/SDL_rpiopengles.h
+++ b/src/video/raspberry/SDL_rpiopengles.h
@@ -23,7 +23,7 @@
 #ifndef SDL_rpiopengles_h_
 #define SDL_rpiopengles_h_
 
-#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+#if defined(SDL_VIDEO_DRIVER_RPI) && SDL_VIDEO_OPENGL_EGL
 
 #include "../SDL_sysvideo.h"
 #include "../SDL_egl_c.h"
diff --git a/src/video/raspberry/SDL_rpivideo.c b/src/video/raspberry/SDL_rpivideo.c
index e9a5847999..441753d43b 100644
--- a/src/video/raspberry/SDL_rpivideo.c
+++ b/src/video/raspberry/SDL_rpivideo.c
@@ -21,7 +21,7 @@
 
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_RPI
+#ifdef SDL_VIDEO_DRIVER_RPI
 
 /* References
  * http://elinux.org/RPi_VideoCore_APIs