diff --git a/Makefile.libretro b/Makefile.libretro
index 251da21b2..d9c3fdf7d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -264,9 +264,9 @@ else ifeq ($(platform), libnx)
 	STATIC_LINKING_LINK=1
 	HAVE_VFS_FD = 0
 	CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(LIBNX)/include/ -fPIE -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
-	DEFINES += -std=c99
+	DEFINES += -std=gnu11
 	ASFLAGS += -DHAVE_LIBNX
-	PLATFORM_DEFINES += -D__SWITCH__ -DHAVE_LIBNX
+	PLATFORM_DEFINES += -D__SWITCH__ -DHAVE_LIBNX -DHAVE_LOCALE
 	PLATFORM_DEFINES += -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd -DHAVE_INTTYPES -DLSB_FIRST -DINLINE=inline
 
 # Nintendo Switch (libtransistor)
diff --git a/src/core/config.c b/src/core/config.c
index ab7b709f3..932c904c2 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -325,10 +325,6 @@ void mCoreConfigCopyValue(struct mCoreConfig* config, const struct mCoreConfig*
 }
 
 void mCoreConfigMap(const struct mCoreConfig* config, struct mCoreOptions* opts) {
-#ifdef HAVE_LIBNX // Needed or fatal
-    return;
-#endif
-
 	_lookupCharValue(config, "bios", &opts->bios);
 	_lookupCharValue(config, "shader", &opts->shader);
 	_lookupIntValue(config, "logLevel", &opts->logLevel);
diff --git a/src/core/core.c b/src/core/core.c
index f0dba9639..343e11ce8 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -294,9 +294,7 @@ void mCoreLoadForeignConfig(struct mCore* core, const struct mCoreConfig* config
 	mCoreConfigCopyValue(&core->config, config, "cheatAutosave");
 	mCoreConfigCopyValue(&core->config, config, "cheatAutoload");
 
-#ifndef HAVE_LIBNX // Needed or fatal
 	core->loadConfig(core, config);
-#endif
 }
 
 void mCoreSetRTC(struct mCore* core, struct mRTCSource* rtc) {