diff --git a/configure b/configure
index d684a2efe..d0044af04 100755
--- a/configure
+++ b/configure
@@ -25629,7 +25629,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
         EXTRA_CFLAGS="$EXTRA_CFLAGS -DSDL_VIDEO_STATIC_ANGLE"
         EXTRA_LDFLAGS="-march=armv8-a -fPIE -L${DEVKITPRO}/libnx/lib -lEGL -lglapi -ldrm_nouveau -lnx"
         CheckDeclarationAfterStatement
-        CheckClockGettime
 
         # Set up files for the video library
         if test x$enable_video = xyes; then
@@ -25672,9 +25671,9 @@ $as_echo "#define SDL_JOYSTICK_SWITCH 1" >>confdefs.h
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
 
-$as_echo "#define SDL_TIMER_SWITCH 1" >>confdefs.h
+$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
 
-            SOURCES="$SOURCES $srcdir/src/timer/switch/*.c"
+            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
             have_timers=yes
         fi
         # Set up files for the thread library
diff --git a/configure.ac b/configure.ac
index 68d359c6b..c4a0116bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4267,22 +4267,10 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         fi
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
-            AC_DEFINE(SDL_TIMER_SWITCH, 1, [ ])
-            SOURCES="$SOURCES $srcdir/src/timer/switch/*.c"
+            AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
+            SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
             have_timers=yes
         fi
-        # Set up files for the system power library
-        if test x$enable_power = xyes; then
-            AC_DEFINE(SDL_POWER_SWITCH, 1, [ ])
-            SOURCES="$SOURCES $srcdir/src/power/switch/*.c"
-            have_power=yes
-        fi
-        # Set up files for the system filesystem library
-        if test x$enable_filesystem = xyes; then
-            AC_DEFINE(SDL_FILESYSTEM_SWITCH, 1, [ ])
-            SOURCES="$SOURCES $srcdir/src/filesystem/switch/*.c"
-            have_filesystem=yes
-        fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
             AC_DEFINE(SDL_THREAD_SWITCH, 1, [ ])