diff --git a/configure.in b/configure.in
index a646cf2e6..af9165771 100644
--- a/configure.in
+++ b/configure.in
@@ -2826,6 +2826,12 @@ if test x$have_loadso != xyes; then
     fi
     SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
 fi
+if test x$have_atomic != xyes; then
+    if test x$enable_atomic = xyes; then
+        AC_DEFINE(SDL_ATOMIC_DISABLED)
+    fi
+    SOURCES="$SOURCES $srcdir/src/atomic/dummy/*.c"
+fi
 if test x$SDLMAIN_SOURCES = x; then
     SDLMAIN_SOURCES="$srcdir/src/main/dummy/*.c"
 fi
diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c
index 5fd15cad3..dc23073e9 100644
--- a/src/joystick/bsd/SDL_sysjoystick.c
+++ b/src/joystick/bsd/SDL_sysjoystick.c
@@ -59,7 +59,7 @@
 #include <libusbhid.h>
 #endif
 
-#ifdef defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
 #ifndef __DragonFly__
 #include <osreldate.h>
 #endif