diff --git a/src/emucore/Booster.cxx b/src/emucore/Booster.cxx
index e8e68bbbd..36925797a 100644
--- a/src/emucore/Booster.cxx
+++ b/src/emucore/Booster.cxx
@@ -51,11 +51,6 @@ BoosterGrip::BoosterGrip(Jack jack, const Event& event, const System& system)
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-BoosterGrip::~BoosterGrip()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void BoosterGrip::update()
 {
diff --git a/src/emucore/Booster.hxx b/src/emucore/Booster.hxx
index 52e0608ed..fc57d1fe2 100644
--- a/src/emucore/Booster.hxx
+++ b/src/emucore/Booster.hxx
@@ -46,7 +46,7 @@ class BoosterGrip : public Controller
     /**
       Destructor
     */
-    virtual ~BoosterGrip();
+    virtual ~BoosterGrip() = default;
 
   public:
     /**
diff --git a/src/emucore/Cart0840.cxx b/src/emucore/Cart0840.cxx
index e7c25a8b1..9e5d73f82 100644
--- a/src/emucore/Cart0840.cxx
+++ b/src/emucore/Cart0840.cxx
@@ -35,11 +35,6 @@ Cartridge0840::Cartridge0840(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge0840::~Cartridge0840()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge0840::reset()
 {
diff --git a/src/emucore/Cart0840.hxx b/src/emucore/Cart0840.hxx
index 17934b2cb..228ecf0ad 100644
--- a/src/emucore/Cart0840.hxx
+++ b/src/emucore/Cart0840.hxx
@@ -50,7 +50,7 @@ class Cartridge0840 : public Cartridge
     /**
       Destructor
     */
-    virtual ~Cartridge0840();
+    virtual ~Cartridge0840() = default;
 
   public:
     /**
diff --git a/src/emucore/Cart4A50.cxx b/src/emucore/Cart4A50.cxx
index 5f03a4be6..3554ed428 100644
--- a/src/emucore/Cart4A50.cxx
+++ b/src/emucore/Cart4A50.cxx
@@ -56,11 +56,6 @@ Cartridge4A50::Cartridge4A50(const uInt8* image, uInt32 size,
   createCodeAccessBase(131072 + 32768);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge4A50::~Cartridge4A50()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge4A50::reset()
 {
diff --git a/src/emucore/Cart4A50.hxx b/src/emucore/Cart4A50.hxx
index 021ca9348..5b7f054d0 100644
--- a/src/emucore/Cart4A50.hxx
+++ b/src/emucore/Cart4A50.hxx
@@ -66,7 +66,7 @@ class Cartridge4A50 : public Cartridge
     /**
       Destructor
     */
-    virtual ~Cartridge4A50();
+    virtual ~Cartridge4A50() = default;
 
   public:
     /**
diff --git a/src/emucore/Cart4K.cxx b/src/emucore/Cart4K.cxx
index 527c0cd00..f3f2dcf75 100644
--- a/src/emucore/Cart4K.cxx
+++ b/src/emucore/Cart4K.cxx
@@ -31,11 +31,6 @@ Cartridge4K::Cartridge4K(const uInt8* image, uInt32 size, const Settings& settin
   createCodeAccessBase(4096);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge4K::~Cartridge4K()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge4K::reset()
 {
diff --git a/src/emucore/Cart4K.hxx b/src/emucore/Cart4K.hxx
index 785ed9ac5..c4881f0c4 100644
--- a/src/emucore/Cart4K.hxx
+++ b/src/emucore/Cart4K.hxx
@@ -52,7 +52,7 @@ class Cartridge4K : public Cartridge
     /**
       Destructor
     */
-    virtual ~Cartridge4K();
+    virtual ~Cartridge4K() = default;
 
   public:
     /**
diff --git a/src/emucore/Cart4KSC.cxx b/src/emucore/Cart4KSC.cxx
index f00064cbf..cb174ffdb 100644
--- a/src/emucore/Cart4KSC.cxx
+++ b/src/emucore/Cart4KSC.cxx
@@ -31,11 +31,6 @@ Cartridge4KSC::Cartridge4KSC(const uInt8* image, uInt32 size, const Settings& se
   createCodeAccessBase(4096);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge4KSC::~Cartridge4KSC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge4KSC::reset()
 {
diff --git a/src/emucore/Cart4KSC.hxx b/src/emucore/Cart4KSC.hxx
index 0eb585772..787859869 100644
--- a/src/emucore/Cart4KSC.hxx
+++ b/src/emucore/Cart4KSC.hxx
@@ -49,7 +49,7 @@ class Cartridge4KSC : public Cartridge
     /**
       Destructor
     */
-    virtual ~Cartridge4KSC();
+    virtual ~Cartridge4KSC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartBF.cxx b/src/emucore/CartBF.cxx
index 0a2e630af..6d387ccfe 100644
--- a/src/emucore/CartBF.cxx
+++ b/src/emucore/CartBF.cxx
@@ -35,11 +35,6 @@ CartridgeBF::CartridgeBF(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeBF::~CartridgeBF()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeBF::reset()
 {
diff --git a/src/emucore/CartBF.hxx b/src/emucore/CartBF.hxx
index 0a93e7db4..599a0490a 100644
--- a/src/emucore/CartBF.hxx
+++ b/src/emucore/CartBF.hxx
@@ -53,7 +53,7 @@ class CartridgeBF : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeBF();
+    virtual ~CartridgeBF() = default;
 
   public:
     /**
diff --git a/src/emucore/CartBFSC.cxx b/src/emucore/CartBFSC.cxx
index 2b7ff40b1..41763f3c5 100644
--- a/src/emucore/CartBFSC.cxx
+++ b/src/emucore/CartBFSC.cxx
@@ -35,11 +35,6 @@ CartridgeBFSC::CartridgeBFSC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 15;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeBFSC::~CartridgeBFSC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeBFSC::reset()
 {
diff --git a/src/emucore/CartBFSC.hxx b/src/emucore/CartBFSC.hxx
index 0d6645c1a..f9b49bde0 100644
--- a/src/emucore/CartBFSC.hxx
+++ b/src/emucore/CartBFSC.hxx
@@ -52,7 +52,7 @@ class CartridgeBFSC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeBFSC();
+    virtual ~CartridgeBFSC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartCM.cxx b/src/emucore/CartCM.cxx
index 836a71f1b..5fbe45462 100644
--- a/src/emucore/CartCM.cxx
+++ b/src/emucore/CartCM.cxx
@@ -38,11 +38,6 @@ CartridgeCM::CartridgeCM(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = mySWCHA & 0x3;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeCM::~CartridgeCM()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeCM::reset()
 {
diff --git a/src/emucore/CartCM.hxx b/src/emucore/CartCM.hxx
index 7a83441d5..6cf115dee 100644
--- a/src/emucore/CartCM.hxx
+++ b/src/emucore/CartCM.hxx
@@ -124,7 +124,7 @@ class CartridgeCM : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeCM();
+    virtual ~CartridgeCM() = default;
 
   public:
     /**
diff --git a/src/emucore/CartCTY.cxx b/src/emucore/CartCTY.cxx
index fd6b3145b..216e2efaf 100644
--- a/src/emucore/CartCTY.cxx
+++ b/src/emucore/CartCTY.cxx
@@ -49,11 +49,6 @@ CartridgeCTY::CartridgeCTY(const uInt8* image, uInt32 size, const OSystem& osyst
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeCTY::~CartridgeCTY()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeCTY::reset()
 {
diff --git a/src/emucore/CartCTY.hxx b/src/emucore/CartCTY.hxx
index 9e627b8ca..7c9ee9a4e 100644
--- a/src/emucore/CartCTY.hxx
+++ b/src/emucore/CartCTY.hxx
@@ -127,7 +127,7 @@ class CartridgeCTY : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeCTY();
+    virtual ~CartridgeCTY() = default;
 
   public:
     /**
diff --git a/src/emucore/CartDF.cxx b/src/emucore/CartDF.cxx
index d39b9a849..82a72bc13 100644
--- a/src/emucore/CartDF.cxx
+++ b/src/emucore/CartDF.cxx
@@ -35,11 +35,6 @@ CartridgeDF::CartridgeDF(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeDF::~CartridgeDF()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeDF::reset()
 {
diff --git a/src/emucore/CartDF.hxx b/src/emucore/CartDF.hxx
index b1353d484..0ad0eb8d6 100644
--- a/src/emucore/CartDF.hxx
+++ b/src/emucore/CartDF.hxx
@@ -53,7 +53,7 @@ class CartridgeDF : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeDF();
+    virtual ~CartridgeDF() = default;
 
   public:
     /**
diff --git a/src/emucore/CartDFSC.cxx b/src/emucore/CartDFSC.cxx
index 5806db1a0..fbdce7d75 100644
--- a/src/emucore/CartDFSC.cxx
+++ b/src/emucore/CartDFSC.cxx
@@ -35,11 +35,6 @@ CartridgeDFSC::CartridgeDFSC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 15;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeDFSC::~CartridgeDFSC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeDFSC::reset()
 {
diff --git a/src/emucore/CartDFSC.hxx b/src/emucore/CartDFSC.hxx
index 7de86c360..dcb0831de 100644
--- a/src/emucore/CartDFSC.hxx
+++ b/src/emucore/CartDFSC.hxx
@@ -52,7 +52,7 @@ class CartridgeDFSC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeDFSC();
+    virtual ~CartridgeDFSC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartDPC.cxx b/src/emucore/CartDPC.cxx
index 84022956d..d46582380 100644
--- a/src/emucore/CartDPC.cxx
+++ b/src/emucore/CartDPC.cxx
@@ -55,11 +55,6 @@ CartridgeDPC::CartridgeDPC(const uInt8* image, uInt32 size,
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeDPC::~CartridgeDPC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeDPC::reset()
 {
diff --git a/src/emucore/CartDPC.hxx b/src/emucore/CartDPC.hxx
index 3c81bfe72..fe426e635 100644
--- a/src/emucore/CartDPC.hxx
+++ b/src/emucore/CartDPC.hxx
@@ -57,7 +57,7 @@ class CartridgeDPC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeDPC();
+    virtual ~CartridgeDPC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartE0.cxx b/src/emucore/CartE0.cxx
index 1fb8b8f02..ae276d0fb 100644
--- a/src/emucore/CartE0.cxx
+++ b/src/emucore/CartE0.cxx
@@ -31,11 +31,6 @@ CartridgeE0::CartridgeE0(const uInt8* image, uInt32 size, const Settings& settin
   createCodeAccessBase(8192);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeE0::~CartridgeE0()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeE0::reset()
 {
diff --git a/src/emucore/CartE0.hxx b/src/emucore/CartE0.hxx
index cf4c4debf..fcdab5c73 100644
--- a/src/emucore/CartE0.hxx
+++ b/src/emucore/CartE0.hxx
@@ -61,7 +61,7 @@ class CartridgeE0 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeE0();
+    virtual ~CartridgeE0() = default;
 
   public:
     /**
diff --git a/src/emucore/CartE7.cxx b/src/emucore/CartE7.cxx
index 8c4b3d505..cd0e6b095 100644
--- a/src/emucore/CartE7.cxx
+++ b/src/emucore/CartE7.cxx
@@ -35,11 +35,6 @@ CartridgeE7::CartridgeE7(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeE7::~CartridgeE7()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeE7::reset()
 {
diff --git a/src/emucore/CartE7.hxx b/src/emucore/CartE7.hxx
index 91eefa6cf..5b9256215 100644
--- a/src/emucore/CartE7.hxx
+++ b/src/emucore/CartE7.hxx
@@ -78,7 +78,7 @@ class CartridgeE7 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeE7();
+    virtual ~CartridgeE7() = default;
 
   public:
     /**
diff --git a/src/emucore/CartEF.cxx b/src/emucore/CartEF.cxx
index e92b598cc..b86d61d98 100644
--- a/src/emucore/CartEF.cxx
+++ b/src/emucore/CartEF.cxx
@@ -35,11 +35,6 @@ CartridgeEF::CartridgeEF(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeEF::~CartridgeEF()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeEF::reset()
 {
diff --git a/src/emucore/CartEF.hxx b/src/emucore/CartEF.hxx
index 2791c2d2f..dc071282a 100644
--- a/src/emucore/CartEF.hxx
+++ b/src/emucore/CartEF.hxx
@@ -56,7 +56,7 @@ class CartridgeEF : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeEF();
+    virtual ~CartridgeEF() = default;
 
   public:
     /**
diff --git a/src/emucore/CartEFSC.cxx b/src/emucore/CartEFSC.cxx
index 346eb7d48..c8b761a9b 100644
--- a/src/emucore/CartEFSC.cxx
+++ b/src/emucore/CartEFSC.cxx
@@ -33,11 +33,6 @@ CartridgeEFSC::CartridgeEFSC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 15;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeEFSC::~CartridgeEFSC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeEFSC::reset()
 {
diff --git a/src/emucore/CartEFSC.hxx b/src/emucore/CartEFSC.hxx
index 866b19e21..981716710 100644
--- a/src/emucore/CartEFSC.hxx
+++ b/src/emucore/CartEFSC.hxx
@@ -56,7 +56,7 @@ class CartridgeEFSC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeEFSC();
+    virtual ~CartridgeEFSC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF0.cxx b/src/emucore/CartF0.cxx
index 70e6ea26f..39d66fc94 100644
--- a/src/emucore/CartF0.cxx
+++ b/src/emucore/CartF0.cxx
@@ -35,11 +35,6 @@ CartridgeF0::CartridgeF0(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 15;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF0::~CartridgeF0()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF0::reset()
 {
diff --git a/src/emucore/CartF0.hxx b/src/emucore/CartF0.hxx
index c404649e7..7b7d6091f 100644
--- a/src/emucore/CartF0.hxx
+++ b/src/emucore/CartF0.hxx
@@ -53,7 +53,7 @@ class CartridgeF0 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF0();
+    virtual ~CartridgeF0() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF4.cxx b/src/emucore/CartF4.cxx
index cc5dff383..070e98a75 100644
--- a/src/emucore/CartF4.cxx
+++ b/src/emucore/CartF4.cxx
@@ -36,11 +36,6 @@ CartridgeF4::CartridgeF4(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF4::~CartridgeF4()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF4::reset()
 {
diff --git a/src/emucore/CartF4.hxx b/src/emucore/CartF4.hxx
index f555856f7..c795aa439 100644
--- a/src/emucore/CartF4.hxx
+++ b/src/emucore/CartF4.hxx
@@ -52,7 +52,7 @@ class CartridgeF4 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF4();
+    virtual ~CartridgeF4() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF4SC.cxx b/src/emucore/CartF4SC.cxx
index 56a5e91fe..a23d1354b 100644
--- a/src/emucore/CartF4SC.cxx
+++ b/src/emucore/CartF4SC.cxx
@@ -35,11 +35,6 @@ CartridgeF4SC::CartridgeF4SC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF4SC::~CartridgeF4SC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF4SC::reset()
 {
diff --git a/src/emucore/CartF4SC.hxx b/src/emucore/CartF4SC.hxx
index 03be49439..c21847b29 100644
--- a/src/emucore/CartF4SC.hxx
+++ b/src/emucore/CartF4SC.hxx
@@ -52,7 +52,7 @@ class CartridgeF4SC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF4SC();
+    virtual ~CartridgeF4SC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF6.cxx b/src/emucore/CartF6.cxx
index 3b1daad67..cce8ffc44 100644
--- a/src/emucore/CartF6.cxx
+++ b/src/emucore/CartF6.cxx
@@ -35,11 +35,6 @@ CartridgeF6::CartridgeF6(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF6::~CartridgeF6()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF6::reset()
 {
diff --git a/src/emucore/CartF6.hxx b/src/emucore/CartF6.hxx
index 1c9c5f101..483ed5b8a 100644
--- a/src/emucore/CartF6.hxx
+++ b/src/emucore/CartF6.hxx
@@ -52,7 +52,7 @@ class CartridgeF6 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF6();
+    virtual ~CartridgeF6() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF6SC.cxx b/src/emucore/CartF6SC.cxx
index 08a3bace8..2a1230935 100644
--- a/src/emucore/CartF6SC.cxx
+++ b/src/emucore/CartF6SC.cxx
@@ -35,11 +35,6 @@ CartridgeF6SC::CartridgeF6SC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF6SC::~CartridgeF6SC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF6SC::reset()
 {
diff --git a/src/emucore/CartF6SC.hxx b/src/emucore/CartF6SC.hxx
index 4444968ad..f91fb8c25 100644
--- a/src/emucore/CartF6SC.hxx
+++ b/src/emucore/CartF6SC.hxx
@@ -52,7 +52,7 @@ class CartridgeF6SC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF6SC();
+    virtual ~CartridgeF6SC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF8.cxx b/src/emucore/CartF8.cxx
index 1cf089c94..521a8d4ca 100644
--- a/src/emucore/CartF8.cxx
+++ b/src/emucore/CartF8.cxx
@@ -43,11 +43,6 @@ CartridgeF8::CartridgeF8(const uInt8* image, uInt32 size, const string& md5,
     ? 0 : 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF8::~CartridgeF8()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF8::reset()
 {
diff --git a/src/emucore/CartF8.hxx b/src/emucore/CartF8.hxx
index ef567dd3d..0dd7dad15 100644
--- a/src/emucore/CartF8.hxx
+++ b/src/emucore/CartF8.hxx
@@ -54,7 +54,7 @@ class CartridgeF8 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF8();
+    virtual ~CartridgeF8() = default;
 
   public:
     /**
diff --git a/src/emucore/CartF8SC.cxx b/src/emucore/CartF8SC.cxx
index 9bf778fc0..19be30f87 100644
--- a/src/emucore/CartF8SC.cxx
+++ b/src/emucore/CartF8SC.cxx
@@ -35,11 +35,6 @@ CartridgeF8SC::CartridgeF8SC(const uInt8* image, uInt32 size, const Settings& se
   myStartBank = 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF8SC::~CartridgeF8SC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF8SC::reset()
 {
diff --git a/src/emucore/CartF8SC.hxx b/src/emucore/CartF8SC.hxx
index 263edaa3d..63fc0da1f 100644
--- a/src/emucore/CartF8SC.hxx
+++ b/src/emucore/CartF8SC.hxx
@@ -52,7 +52,7 @@ class CartridgeF8SC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeF8SC();
+    virtual ~CartridgeF8SC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartFA.cxx b/src/emucore/CartFA.cxx
index 504861a00..d2693564f 100644
--- a/src/emucore/CartFA.cxx
+++ b/src/emucore/CartFA.cxx
@@ -35,11 +35,6 @@ CartridgeFA::CartridgeFA(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 2;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeFA::~CartridgeFA()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeFA::reset()
 {
diff --git a/src/emucore/CartFA.hxx b/src/emucore/CartFA.hxx
index 843df3ee1..8b4153ace 100644
--- a/src/emucore/CartFA.hxx
+++ b/src/emucore/CartFA.hxx
@@ -52,7 +52,7 @@ class CartridgeFA : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeFA();
+    virtual ~CartridgeFA() = default;
 
   public:
     /**
diff --git a/src/emucore/CartFA2.cxx b/src/emucore/CartFA2.cxx
index d96308a53..ad5c40153 100644
--- a/src/emucore/CartFA2.cxx
+++ b/src/emucore/CartFA2.cxx
@@ -44,11 +44,6 @@ CartridgeFA2::CartridgeFA2(const uInt8* image, uInt32 size, const OSystem& osyst
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeFA2::~CartridgeFA2()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeFA2::reset()
 {
diff --git a/src/emucore/CartFA2.hxx b/src/emucore/CartFA2.hxx
index 22fa0281b..eb4a1f387 100644
--- a/src/emucore/CartFA2.hxx
+++ b/src/emucore/CartFA2.hxx
@@ -60,7 +60,7 @@ class CartridgeFA2 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeFA2();
+    virtual ~CartridgeFA2() = default;
 
   public:
     /**
diff --git a/src/emucore/CartFE.cxx b/src/emucore/CartFE.cxx
index 7911ce615..c9e3a9c0b 100644
--- a/src/emucore/CartFE.cxx
+++ b/src/emucore/CartFE.cxx
@@ -42,11 +42,6 @@ CartridgeFE::CartridgeFE(const uInt8* image, uInt32 size, const Settings& settin
   createCodeAccessBase(8192);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeFE::~CartridgeFE()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeFE::reset()
 {
diff --git a/src/emucore/CartFE.hxx b/src/emucore/CartFE.hxx
index cb0f739cc..981e88219 100644
--- a/src/emucore/CartFE.hxx
+++ b/src/emucore/CartFE.hxx
@@ -67,7 +67,7 @@ class CartridgeFE : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeFE();
+    virtual ~CartridgeFE() = default;
 
   public:
     /**
diff --git a/src/emucore/CartMC.cxx b/src/emucore/CartMC.cxx
index f525fd5c8..dfd4a92da 100644
--- a/src/emucore/CartMC.cxx
+++ b/src/emucore/CartMC.cxx
@@ -46,11 +46,6 @@ CartridgeMC::CartridgeMC(const uInt8* image, uInt32 size,
   memcpy(myImage + 131072 - size, image, size);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeMC::~CartridgeMC()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeMC::reset()
 {
diff --git a/src/emucore/CartMC.hxx b/src/emucore/CartMC.hxx
index 8ad668a59..2d60ffc92 100644
--- a/src/emucore/CartMC.hxx
+++ b/src/emucore/CartMC.hxx
@@ -158,7 +158,7 @@ class CartridgeMC : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeMC();
+    virtual ~CartridgeMC() = default;
 
   public:
     /**
diff --git a/src/emucore/CartUA.cxx b/src/emucore/CartUA.cxx
index 2ebcf57f3..db3c9721d 100644
--- a/src/emucore/CartUA.cxx
+++ b/src/emucore/CartUA.cxx
@@ -35,11 +35,6 @@ CartridgeUA::CartridgeUA(const uInt8* image, uInt32 size, const Settings& settin
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeUA::~CartridgeUA()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeUA::reset()
 {
diff --git a/src/emucore/CartUA.hxx b/src/emucore/CartUA.hxx
index a5938d6a3..2013a6937 100644
--- a/src/emucore/CartUA.hxx
+++ b/src/emucore/CartUA.hxx
@@ -52,7 +52,7 @@ class CartridgeUA : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeUA();
+    virtual ~CartridgeUA() = default;
 
   public:
     /**
diff --git a/src/emucore/CartWD.cxx b/src/emucore/CartWD.cxx
index 0f79a5e31..b15e7f035 100644
--- a/src/emucore/CartWD.cxx
+++ b/src/emucore/CartWD.cxx
@@ -41,11 +41,6 @@ CartridgeWD::CartridgeWD(const uInt8* image, uInt32 size,
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeWD::~CartridgeWD()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeWD::reset()
 {
diff --git a/src/emucore/CartWD.hxx b/src/emucore/CartWD.hxx
index a7fe19b84..5bd94c9be 100644
--- a/src/emucore/CartWD.hxx
+++ b/src/emucore/CartWD.hxx
@@ -80,7 +80,7 @@ class CartridgeWD : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeWD();
+    virtual ~CartridgeWD() = default;
 
   public:
     /**
diff --git a/src/emucore/CartX07.cxx b/src/emucore/CartX07.cxx
index 56dbf4b67..7d149d0df 100644
--- a/src/emucore/CartX07.cxx
+++ b/src/emucore/CartX07.cxx
@@ -37,11 +37,6 @@ CartridgeX07::CartridgeX07(const uInt8* image, uInt32 size, const Settings& sett
   myStartBank = 0;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeX07::~CartridgeX07()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeX07::reset()
 {
diff --git a/src/emucore/CartX07.hxx b/src/emucore/CartX07.hxx
index 7f4e5bded..9e41a652f 100644
--- a/src/emucore/CartX07.hxx
+++ b/src/emucore/CartX07.hxx
@@ -62,7 +62,7 @@ class CartridgeX07 : public Cartridge
     /**
       Destructor
     */
-    virtual ~CartridgeX07();
+    virtual ~CartridgeX07() = default;
 
   public:
     /**
diff --git a/src/emucore/CompuMate.hxx b/src/emucore/CompuMate.hxx
index 10eb20d8b..cc31f6f9c 100644
--- a/src/emucore/CompuMate.hxx
+++ b/src/emucore/CompuMate.hxx
@@ -60,7 +60,7 @@ class CompuMate
       Destructor
       Controllers are deleted outside this class
     */
-    virtual ~CompuMate() { }
+    virtual ~CompuMate() = default;
 
     /**
       Return the left and right CompuMate controllers
@@ -112,7 +112,7 @@ class CompuMate
         /**
           Destructor
         */
-        virtual ~CMControl() { }
+        virtual ~CMControl() = default;
 
       public:
         /**
@@ -122,7 +122,9 @@ class CompuMate
 
           @param value  The entire contents of the SWCHA register
         */
-        void controlWrite(uInt8) override { if(myJack == Controller::Left) myHandler.update(); }
+        void controlWrite(uInt8) override {
+          if(myJack == Controller::Left) myHandler.update();
+        }
 
         /**
           Update the entire digital and analog pin state according to the
diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx
index 4a1dfb307..b04783c19 100644
--- a/src/emucore/Control.cxx
+++ b/src/emucore/Control.cxx
@@ -86,11 +86,6 @@ Controller::Controller(Jack jack, const Event& event, const System& system,
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Controller::~Controller()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt8 Controller::read()
 {
diff --git a/src/emucore/Control.hxx b/src/emucore/Control.hxx
index 124ad7c5c..09362d36a 100644
--- a/src/emucore/Control.hxx
+++ b/src/emucore/Control.hxx
@@ -110,7 +110,7 @@ class Controller : public Serializable
     /**
       Destructor
     */
-    virtual ~Controller();
+    virtual ~Controller() = default;
 
     /**
       Returns the jack that this controller is plugged into.
diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx
index 03813cf0a..b19199035 100644
--- a/src/emucore/Device.hxx
+++ b/src/emucore/Device.hxx
@@ -43,7 +43,7 @@ class Device : public Serializable
     /**
       Destructor
     */
-    virtual ~Device() { }
+    virtual ~Device() = default;
 
   public:
     /**
diff --git a/src/emucore/Driving.cxx b/src/emucore/Driving.cxx
index efe7bd23f..f68667775 100644
--- a/src/emucore/Driving.cxx
+++ b/src/emucore/Driving.cxx
@@ -56,11 +56,6 @@ Driving::Driving(Jack jack, const Event& event, const System& system)
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Driving::~Driving()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Driving::update()
 {
diff --git a/src/emucore/Driving.hxx b/src/emucore/Driving.hxx
index 21a731563..9fa9a9a08 100644
--- a/src/emucore/Driving.hxx
+++ b/src/emucore/Driving.hxx
@@ -46,7 +46,7 @@ class Driving : public Controller
     /**
       Destructor
     */
-    virtual ~Driving();
+    virtual ~Driving() = default;
 
   public:
     /**
diff --git a/src/emucore/FBSurface.hxx b/src/emucore/FBSurface.hxx
index c554adb31..e8fb17a40 100644
--- a/src/emucore/FBSurface.hxx
+++ b/src/emucore/FBSurface.hxx
@@ -63,7 +63,7 @@ class FBSurface
     /**
       Destructor
     */
-    virtual ~FBSurface() { }
+    virtual ~FBSurface() = default;
 
     /**
       This method returns the surface pixel pointer and pitch, which are
diff --git a/src/emucore/FSNode.hxx b/src/emucore/FSNode.hxx
index 3077e66d9..a1df9ee08 100644
--- a/src/emucore/FSNode.hxx
+++ b/src/emucore/FSNode.hxx
@@ -93,7 +93,7 @@ class FilesystemNode
      */
     explicit FilesystemNode(const string& path);
 
-    virtual ~FilesystemNode() { }
+    virtual ~FilesystemNode() = default;
 
     /**
      * Assignment operators.
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 4e67aa20e..ef93e9757 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -56,11 +56,6 @@ FrameBuffer::FrameBuffer(OSystem& osystem)
   myMsg.enabled = myStatsMsg.enabled = false;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-FrameBuffer::~FrameBuffer()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool FrameBuffer::initialize()
 {
diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx
index 00ebbbf74..7f253eebf 100644
--- a/src/emucore/FrameBuffer.hxx
+++ b/src/emucore/FrameBuffer.hxx
@@ -144,7 +144,7 @@ class FrameBuffer
     /**
       Destructor
     */
-    virtual ~FrameBuffer();
+    virtual ~FrameBuffer() = default;
 
     /**
       Initialize the framebuffer object (set up the underlying hardware)
diff --git a/src/emucore/Genesis.cxx b/src/emucore/Genesis.cxx
index 537d11591..99ecd9603 100644
--- a/src/emucore/Genesis.cxx
+++ b/src/emucore/Genesis.cxx
@@ -50,11 +50,6 @@ Genesis::Genesis(Jack jack, const Event& event, const System& system)
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Genesis::~Genesis()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Genesis::update()
 {
diff --git a/src/emucore/Genesis.hxx b/src/emucore/Genesis.hxx
index 78aaf7873..86c19cffb 100644
--- a/src/emucore/Genesis.hxx
+++ b/src/emucore/Genesis.hxx
@@ -47,7 +47,7 @@ class Genesis : public Controller
     /**
       Destructor
     */
-    virtual ~Genesis();
+    virtual ~Genesis() = default;
 
   public:
     /**
diff --git a/src/emucore/Joystick.cxx b/src/emucore/Joystick.cxx
index 68d28c901..ac050c496 100644
--- a/src/emucore/Joystick.cxx
+++ b/src/emucore/Joystick.cxx
@@ -50,11 +50,6 @@ Joystick::Joystick(Jack jack, const Event& event, const System& system)
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Joystick::~Joystick()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Joystick::update()
 {
diff --git a/src/emucore/Joystick.hxx b/src/emucore/Joystick.hxx
index efda83047..59d9aa37e 100644
--- a/src/emucore/Joystick.hxx
+++ b/src/emucore/Joystick.hxx
@@ -45,7 +45,7 @@ class Joystick : public Controller
     /**
       Destructor
     */
-    virtual ~Joystick();
+    virtual ~Joystick() = default;
 
   public:
     /**
diff --git a/src/emucore/Keyboard.cxx b/src/emucore/Keyboard.cxx
index 41941a600..6a2711119 100644
--- a/src/emucore/Keyboard.cxx
+++ b/src/emucore/Keyboard.cxx
@@ -56,11 +56,6 @@ Keyboard::Keyboard(Jack jack, const Event& event, const System& system)
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Keyboard::~Keyboard()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Keyboard::write(DigitalPin pin, bool value)
 {
diff --git a/src/emucore/Keyboard.hxx b/src/emucore/Keyboard.hxx
index 4dd3f1727..9ee6931fb 100644
--- a/src/emucore/Keyboard.hxx
+++ b/src/emucore/Keyboard.hxx
@@ -45,7 +45,7 @@ class Keyboard : public Controller
     /**
       Destructor
     */
-    virtual ~Keyboard();
+    virtual ~Keyboard() = default;
 
   public:
     /**
diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index 4481b54cf..7042408e7 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -68,11 +68,6 @@ M6502::M6502(const Settings& settings)
 #endif
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-M6502::~M6502()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void M6502::install(System& system)
 {
diff --git a/src/emucore/M6502.hxx b/src/emucore/M6502.hxx
index 3d049e524..952eac1e6 100644
--- a/src/emucore/M6502.hxx
+++ b/src/emucore/M6502.hxx
@@ -62,7 +62,7 @@ class M6502 : public Serializable
     /**
       Destructor
     */
-    virtual ~M6502();
+    virtual ~M6502() = default;
 
   public:
     /**
diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx
index c5469735a..8b4e3a50c 100644
--- a/src/emucore/M6532.cxx
+++ b/src/emucore/M6532.cxx
@@ -39,11 +39,6 @@ M6532::M6532(const Console& console, const Settings& settings)
 {
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-M6532::~M6532()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void M6532::reset()
 {
diff --git a/src/emucore/M6532.hxx b/src/emucore/M6532.hxx
index 78043d05d..62c5349b4 100644
--- a/src/emucore/M6532.hxx
+++ b/src/emucore/M6532.hxx
@@ -59,7 +59,7 @@ class M6532 : public Device
     /**
       Destructor
     */
-    virtual ~M6532();
+    virtual ~M6532() = default;
 
    public:
     /**
diff --git a/src/emucore/MindLink.cxx b/src/emucore/MindLink.cxx
index 36e7fd0bd..b35deb787 100644
--- a/src/emucore/MindLink.cxx
+++ b/src/emucore/MindLink.cxx
@@ -36,11 +36,6 @@ MindLink::MindLink(Jack jack, const Event& event, const System& system)
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-MindLink::~MindLink()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void MindLink::update()
 {
diff --git a/src/emucore/MindLink.hxx b/src/emucore/MindLink.hxx
index da45b9e22..e8f8f64e7 100644
--- a/src/emucore/MindLink.hxx
+++ b/src/emucore/MindLink.hxx
@@ -55,7 +55,7 @@ class MindLink : public Controller
     /**
       Destructor
     */
-    virtual ~MindLink();
+    virtual ~MindLink() = default;
 
   public:
     /**
diff --git a/src/emucore/NullDev.hxx b/src/emucore/NullDev.hxx
index bb403e6c5..4af9dee1e 100644
--- a/src/emucore/NullDev.hxx
+++ b/src/emucore/NullDev.hxx
@@ -39,12 +39,12 @@ class NullDevice : public Device
     /**
       Create a new null device
     */
-    NullDevice() { }
+    NullDevice() = default;
 
     /**
       Destructor
     */
-    virtual ~NullDevice() { }
+    virtual ~NullDevice() = default;
 
   public:
     /**
diff --git a/src/emucore/Paddles.cxx b/src/emucore/Paddles.cxx
index ccdabd7b6..850143b12 100644
--- a/src/emucore/Paddles.cxx
+++ b/src/emucore/Paddles.cxx
@@ -230,11 +230,6 @@ Paddles::Paddles(Jack jack, const Event& event, const System& system,
   assert(_DIGITAL_SENSITIVITY != -1 && _MOUSE_SENSITIVITY != -1);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Paddles::~Paddles()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Paddles::update()
 {
diff --git a/src/emucore/Paddles.hxx b/src/emucore/Paddles.hxx
index ba851153a..59957449f 100644
--- a/src/emucore/Paddles.hxx
+++ b/src/emucore/Paddles.hxx
@@ -52,7 +52,7 @@ class Paddles : public Controller
     /**
       Destructor
     */
-    virtual ~Paddles();
+    virtual ~Paddles() = default;
 
   public:
     /**
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 80a4352eb..21f62a09f 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -155,11 +155,6 @@ Settings::Settings(OSystem& osystem)
 #endif
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Settings::~Settings()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Settings::loadConfig()
 {
diff --git a/src/emucore/Settings.hxx b/src/emucore/Settings.hxx
index c0df87bef..717d8690d 100644
--- a/src/emucore/Settings.hxx
+++ b/src/emucore/Settings.hxx
@@ -44,7 +44,7 @@ class Settings
     /**
       Destructor
     */
-    virtual ~Settings();
+    virtual ~Settings() = default;
 
   public:
     /**
diff --git a/src/emucore/Sound.hxx b/src/emucore/Sound.hxx
index fe38c25a2..cefc4993f 100644
--- a/src/emucore/Sound.hxx
+++ b/src/emucore/Sound.hxx
@@ -44,7 +44,7 @@ class Sound : public Serializable
     /**
       Destructor
     */
-    virtual ~Sound() { }
+    virtual ~Sound() = default;
 
   public: 
     /**
diff --git a/src/emucore/Switches.cxx b/src/emucore/Switches.cxx
index afeca31b1..68ced9be2 100644
--- a/src/emucore/Switches.cxx
+++ b/src/emucore/Switches.cxx
@@ -54,11 +54,6 @@ Switches::Switches(const Event& event, const Properties& properties)
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-Switches::~Switches()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 void Switches::update()
 {
diff --git a/src/emucore/Switches.hxx b/src/emucore/Switches.hxx
index 1574d7fe8..ebc9013e7 100644
--- a/src/emucore/Switches.hxx
+++ b/src/emucore/Switches.hxx
@@ -51,7 +51,7 @@ class Switches : public Serializable
     /**
       Destructor
     */
-    virtual ~Switches();
+    virtual ~Switches() = default;
 
   public:
     /**
diff --git a/src/emucore/System.cxx b/src/emucore/System.cxx
index 0a211d1c7..a4bfb7f9e 100644
--- a/src/emucore/System.cxx
+++ b/src/emucore/System.cxx
@@ -55,11 +55,6 @@ System::System(const OSystem& osystem, M6502& m6502, M6532& m6532,
   myDataBusLocked = false;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-System::~System()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void System::initialize()
 {
diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx
index 5768fc407..2d081e617 100644
--- a/src/emucore/System.hxx
+++ b/src/emucore/System.hxx
@@ -58,7 +58,7 @@ class System : public Serializable
     /**
       Destructor
     */
-    virtual ~System();
+    virtual ~System() = default;
 
     // Mask to apply to an address before accessing memory
     static const uInt16 ADDRESS_MASK = (1 << 13) - 1;
diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index 4aaa71e5f..bf2b4fcd8 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -70,11 +70,6 @@ Thumbulator::Thumbulator(const uInt16* rom_ptr, uInt16* ram_ptr, bool traponfata
   trapFatalErrors(traponfatal);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Thumbulator::~Thumbulator()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 string Thumbulator::run( void )
 {
diff --git a/src/emucore/Thumbulator.hxx b/src/emucore/Thumbulator.hxx
index 50601be17..a417cdb5e 100644
--- a/src/emucore/Thumbulator.hxx
+++ b/src/emucore/Thumbulator.hxx
@@ -63,7 +63,6 @@ class Thumbulator
 {
   public:
     Thumbulator(const uInt16* rom, uInt16* ram, bool traponfatal);
-    ~Thumbulator();
 
     /**
       Run the ARM code, and return when finished.  A runtime_error exception is
diff --git a/src/emucore/TrackBall.cxx b/src/emucore/TrackBall.cxx
index 5110ebc33..ddd1c07b9 100644
--- a/src/emucore/TrackBall.cxx
+++ b/src/emucore/TrackBall.cxx
@@ -46,11 +46,6 @@ TrackBall::TrackBall(Jack jack, const Event& event, const System& system,
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TrackBall::~TrackBall()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt8 TrackBall::read()
 {
diff --git a/src/emucore/TrackBall.hxx b/src/emucore/TrackBall.hxx
index 2e0574628..1878c4b7a 100644
--- a/src/emucore/TrackBall.hxx
+++ b/src/emucore/TrackBall.hxx
@@ -54,7 +54,7 @@ class TrackBall : public Controller
     /**
       Destructor
     */
-    virtual ~TrackBall();
+    virtual ~TrackBall() = default;
 
   public:
     using Controller::read;