diff --git a/src/common/StellaKeys.hxx b/src/common/StellaKeys.hxx
index c6fe1ac8d..7e68347ea 100644
--- a/src/common/StellaKeys.hxx
+++ b/src/common/StellaKeys.hxx
@@ -435,7 +435,7 @@ namespace StellaModTest
   {
     return (mod & KBDM_SHIFT);
   }
-};
+}
 
 namespace StellaKeyName
 {
@@ -447,6 +447,6 @@ namespace StellaKeyName
     return "";
   #endif
   }
-};
+}
 
 #endif /* StellaKeys */
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 802d47eb3..b7b6f63f6 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -10,6 +10,9 @@ BACKSLASH := \$(BACKSLASH)
 filter_out1 = $(filter-out $(firstword $1),$1)
 filter_out2 = $(call filter_out1,$(call filter_out1,$1))
 
+CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers
+CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14
+
 ifeq ($(platform),)
    platform = unix
    ifeq ($(shell uname -s),)
@@ -113,8 +116,8 @@ else ifeq ($(platform), libnx)
 # Platform affix = classic_<ISA>_<µARCH>
 # Help at https://modmyclassic.com/comp
 
-# (armv7 a7, hard point, neon based) ### 
-# NESC, SNESC, C64 mini 
+# (armv7 a7, hard point, neon based) ###
+# NESC, SNESC, C64 mini
 else ifeq ($(platform), classic_armv7_a7)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
@@ -142,7 +145,7 @@ else ifeq ($(platform), classic_armv7_a7)
 	  endif
 	endif
 #######################################
-   
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
    CFLAGS += $(LTO) $(PTHREAD_FLAGS)
@@ -605,14 +608,14 @@ ifeq (,$(findstring msvc,$(platform)))
    ifeq ($(HAVE_STRINGS_H), 1)
       CXXFLAGS += -DHAVE_STRINGS_H
    endif
-   CXXFLAGS += -fno-rtti -pedantic 
+   CXXFLAGS += -fno-rtti -pedantic
    ifneq ($(HAVE_EXCEPTIONS), 1)
       CXXFLAGS += -fno-exceptions
    endif
 endif
 
 OBJOUT   = -o
-LINKOUT  = -o 
+LINKOUT  = -o
 
 ifneq (,$(findstring msvc,$(platform)))
 	OBJOUT = -Fo