diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx
index cead54b21..787faca38 100644
--- a/src/cheat/CheatCodeDialog.cxx
+++ b/src/cheat/CheatCodeDialog.cxx
@@ -105,11 +105,6 @@ CheatCodeDialog::CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
   addBGroupToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CheatCodeDialog::~CheatCodeDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CheatCodeDialog::loadConfig()
 {
diff --git a/src/cheat/CheatCodeDialog.hxx b/src/cheat/CheatCodeDialog.hxx
index bdf779915..7de0f74b5 100644
--- a/src/cheat/CheatCodeDialog.hxx
+++ b/src/cheat/CheatCodeDialog.hxx
@@ -27,18 +27,18 @@ class ButtonWidget;
 class StaticTextWidget;
 class CheckListWidget;
 class EditTextWidget;
-class InputTextDialog;
 class OptionsDialog;
 class OSystem;
 
 #include "Dialog.hxx"
+#include "InputTextDialog.hxx"
 
 class CheatCodeDialog : public Dialog
 {
   public:
     CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
                    const GUI::Font& font);
-    virtual ~CheatCodeDialog();
+    virtual ~CheatCodeDialog() = default;
 
   protected:
     void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx
index 7334eaefb..9d3bc1179 100644
--- a/src/debugger/Debugger.cxx
+++ b/src/debugger/Debugger.cxx
@@ -134,11 +134,6 @@ Debugger::Debugger(OSystem& osystem, Console& console)
   myStaticDebugger = this;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Debugger::~Debugger()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Debugger::initialize()
 {
diff --git a/src/debugger/Debugger.hxx b/src/debugger/Debugger.hxx
index 6430d77bb..e4fd8210b 100644
--- a/src/debugger/Debugger.hxx
+++ b/src/debugger/Debugger.hxx
@@ -22,10 +22,6 @@
 
 class OSystem;
 class Console;
-class CartDebug;
-class CpuDebug;
-class RiotDebug;
-class TIADebug;
 class TiaInfoWidget;
 class TiaOutputWidget;
 class TiaZoomWidget;
@@ -46,6 +42,10 @@ class ButtonWidget;
 #include "M6502.hxx"
 #include "System.hxx"
 #include "Stack.hxx"
+#include "CartDebug.hxx"
+#include "CpuDebug.hxx"
+#include "RiotDebug.hxx"
+#include "TIADebug.hxx"
 #include "bspf.hxx"
 
 using FunctionMap = map<string,unique_ptr<Expression>>;
@@ -76,7 +76,7 @@ class Debugger : public DialogContainer
     /**
       Destructor
     */
-    virtual ~Debugger();
+    virtual ~Debugger() = default;
 
   public:
     /**
diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx
index a3207f6d8..d2697bd67 100644
--- a/src/debugger/gui/RamWidget.cxx
+++ b/src/debugger/gui/RamWidget.cxx
@@ -159,11 +159,6 @@ RamWidget::RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
   if(_h == 0)  _h = ypos + myLineHeight - y;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RamWidget::~RamWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
 {
diff --git a/src/debugger/gui/RamWidget.hxx b/src/debugger/gui/RamWidget.hxx
index bb404de38..862ec6721 100644
--- a/src/debugger/gui/RamWidget.hxx
+++ b/src/debugger/gui/RamWidget.hxx
@@ -21,7 +21,6 @@
 #define RAM_WIDGET_HXX
 
 class GuiObject;
-class InputTextDialog;
 class ButtonWidget;
 class DataGridWidget;
 class DataGridOpsWidget;
@@ -30,6 +29,7 @@ class StaticTextWidget;
 
 #include "Widget.hxx"
 #include "Command.hxx"
+#include "InputTextDialog.hxx"
 
 class RamWidget : public Widget, public CommandSender
 {
@@ -37,7 +37,7 @@ class RamWidget : public Widget, public CommandSender
     RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
               int x, int y, int w, int h,
               uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
-    virtual ~RamWidget();
+    virtual ~RamWidget() = default;
 
     void loadConfig() override;
     void setOpsWidget(DataGridOpsWidget* w);
diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx
index c294e7217..ee931c228 100644
--- a/src/emucore/AtariVox.cxx
+++ b/src/emucore/AtariVox.cxx
@@ -45,11 +45,6 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-AtariVox::~AtariVox()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool AtariVox::read(DigitalPin pin)
 {
diff --git a/src/emucore/AtariVox.hxx b/src/emucore/AtariVox.hxx
index 57c4dba1a..4e0e00247 100644
--- a/src/emucore/AtariVox.hxx
+++ b/src/emucore/AtariVox.hxx
@@ -21,9 +21,9 @@
 #define ATARIVOX_HXX
 
 class SerialPort;
-class MT24LC256;
 
 #include "Control.hxx"
+#include "MT24LC256.hxx"
 
 /**
   Richard Hutchinson's AtariVox "controller": A speech synthesizer and
@@ -57,7 +57,7 @@ class AtariVox : public Controller
     /**
       Destructor
     */
-    virtual ~AtariVox();
+    virtual ~AtariVox() = default;
 
   public:
     using Controller::read;
diff --git a/src/emucore/KidVid.cxx b/src/emucore/KidVid.cxx
index 8cd8951a6..21f7f6b20 100644
--- a/src/emucore/KidVid.cxx
+++ b/src/emucore/KidVid.cxx
@@ -231,10 +231,12 @@ void KidVid::setNextSong()
     mySharedData = (temp < 10);
     mySongCounter = ourSongStart[temp+1] - ourSongStart[temp];
 
+#if 0
     if(mySharedData)
       ; // fseek(mySharedSampleFile, ourSongStart[temp], SEEK_SET);
     else
       ; // fseek(mySampleFile, ourSongStart[temp], SEEK_SET);
+#endif
 
     myFilePointer++;
     myTapeBusy = true;
diff --git a/src/emucore/SaveKey.cxx b/src/emucore/SaveKey.cxx
index 11ecbf059..2d64882d3 100644
--- a/src/emucore/SaveKey.cxx
+++ b/src/emucore/SaveKey.cxx
@@ -32,11 +32,6 @@ SaveKey::SaveKey(Jack jack, const Event& event, const System& system,
   myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SaveKey::~SaveKey()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool SaveKey::read(DigitalPin pin)
 {
diff --git a/src/emucore/SaveKey.hxx b/src/emucore/SaveKey.hxx
index 6b5f84c86..e38e781f2 100644
--- a/src/emucore/SaveKey.hxx
+++ b/src/emucore/SaveKey.hxx
@@ -20,9 +20,8 @@
 #ifndef SAVEKEY_HXX
 #define SAVEKEY_HXX
 
-class MT24LC256;
-
 #include "Control.hxx"
+#include "MT24LC256.hxx"
 
 /**
   Richard Hutchinson's SaveKey "controller", consisting of a 32KB EEPROM
@@ -53,7 +52,7 @@ class SaveKey : public Controller
     /**
       Destructor
     */
-    virtual ~SaveKey();
+    virtual ~SaveKey() = default;
 
   public:
     using Controller::read;
diff --git a/src/emucore/SerialPort.hxx b/src/emucore/SerialPort.hxx
index 61fddc5fb..dfd5e5b28 100644
--- a/src/emucore/SerialPort.hxx
+++ b/src/emucore/SerialPort.hxx
@@ -33,8 +33,8 @@
 class SerialPort
 {
   public:
-    SerialPort() { }
-    virtual ~SerialPort() { }
+    SerialPort() = default;
+    virtual ~SerialPort() = default;
 
     /**
       Open the given serial port with the specified attributes.
diff --git a/src/emucore/Serializable.hxx b/src/emucore/Serializable.hxx
index e6f128daa..dbef20077 100644
--- a/src/emucore/Serializable.hxx
+++ b/src/emucore/Serializable.hxx
@@ -33,8 +33,8 @@
 class Serializable
 {
   public:
-    Serializable() { }
-    virtual ~Serializable() { }
+    Serializable() = default;
+    virtual ~Serializable() = default;
 
     /**
       Save the current state of the object to the given Serializer.
diff --git a/src/macosx/OSystemMACOSX.cxx b/src/macosx/OSystemMACOSX.cxx
index ff47630ab..0256cf981 100644
--- a/src/macosx/OSystemMACOSX.cxx
+++ b/src/macosx/OSystemMACOSX.cxx
@@ -40,11 +40,6 @@ OSystemMACOSX::OSystemMACOSX()
   setConfigFile("~/Library/Application Support/Stella/stellarc");
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-OSystemMACOSX::~OSystemMACOSX()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 string OSystemMACOSX::defaultSnapSaveDir()
 {
diff --git a/src/macosx/OSystemMACOSX.hxx b/src/macosx/OSystemMACOSX.hxx
index d43059e02..7165c980d 100644
--- a/src/macosx/OSystemMACOSX.hxx
+++ b/src/macosx/OSystemMACOSX.hxx
@@ -39,7 +39,7 @@ class OSystemMACOSX : public OSystem
     /**
       Destructor
     */
-    virtual ~OSystemMACOSX();
+    virtual ~OSystemMACOSX() = default;
 
     /**
       Returns the default paths for the snapshot directory.
diff --git a/src/macosx/SettingsMACOSX.cxx b/src/macosx/SettingsMACOSX.cxx
index 8f88c45e9..edc94f6be 100644
--- a/src/macosx/SettingsMACOSX.cxx
+++ b/src/macosx/SettingsMACOSX.cxx
@@ -31,11 +31,6 @@ SettingsMACOSX::SettingsMACOSX(OSystem& osystem)
 {
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SettingsMACOSX::~SettingsMACOSX()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void SettingsMACOSX::loadConfig()
 {
diff --git a/src/macosx/SettingsMACOSX.hxx b/src/macosx/SettingsMACOSX.hxx
index f3b91db1e..920ae8ca7 100644
--- a/src/macosx/SettingsMACOSX.hxx
+++ b/src/macosx/SettingsMACOSX.hxx
@@ -41,7 +41,7 @@ class SettingsMACOSX : public Settings
     /**
       Destructor
     */
-    virtual ~SettingsMACOSX();
+    virtual ~SettingsMACOSX() = default;
 
   public:
     /**
diff --git a/src/unix/OSystemUNIX.cxx b/src/unix/OSystemUNIX.cxx
index cccf2196f..bd2001057 100644
--- a/src/unix/OSystemUNIX.cxx
+++ b/src/unix/OSystemUNIX.cxx
@@ -36,8 +36,3 @@ OSystemUNIX::OSystemUNIX()
   setBaseDir("~/.stella");
   setConfigFile("~/.stella/stellarc");
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-OSystemUNIX::~OSystemUNIX()
-{
-}
diff --git a/src/unix/OSystemUNIX.hxx b/src/unix/OSystemUNIX.hxx
index 9f9e71aef..2032192f7 100644
--- a/src/unix/OSystemUNIX.hxx
+++ b/src/unix/OSystemUNIX.hxx
@@ -39,7 +39,7 @@ class OSystemUNIX : public OSystem
     /**
       Destructor
     */
-    virtual ~OSystemUNIX();
+    virtual ~OSystemUNIX() = default;
 
   private:
     // Following constructors and assignment operators not supported
diff --git a/src/unix/SettingsUNIX.cxx b/src/unix/SettingsUNIX.cxx
index be96885b2..9fbcdcb8f 100644
--- a/src/unix/SettingsUNIX.cxx
+++ b/src/unix/SettingsUNIX.cxx
@@ -24,8 +24,3 @@ SettingsUNIX::SettingsUNIX(OSystem& osystem)
   : Settings(osystem)
 {
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SettingsUNIX::~SettingsUNIX()
-{
-}
diff --git a/src/unix/SettingsUNIX.hxx b/src/unix/SettingsUNIX.hxx
index 7b215617b..2a21f5226 100644
--- a/src/unix/SettingsUNIX.hxx
+++ b/src/unix/SettingsUNIX.hxx
@@ -41,7 +41,7 @@ class SettingsUNIX : public Settings
     /**
       Destructor
     */
-    virtual ~SettingsUNIX();
+    virtual ~SettingsUNIX() = default;
 
   private:
     // Following constructors and assignment operators not supported
diff --git a/src/windows/OSystemWINDOWS.cxx b/src/windows/OSystemWINDOWS.cxx
index 44f7c1031..de883bb76 100644
--- a/src/windows/OSystemWINDOWS.cxx
+++ b/src/windows/OSystemWINDOWS.cxx
@@ -83,11 +83,6 @@ OSystemWINDOWS::OSystemWINDOWS()
   setConfigFile(basedir + "\\stella.ini");
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-OSystemWINDOWS::~OSystemWINDOWS()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 string OSystemWINDOWS::defaultSnapSaveDir()
 {
diff --git a/src/windows/OSystemWINDOWS.hxx b/src/windows/OSystemWINDOWS.hxx
index 295aec148..f6304d4c4 100644
--- a/src/windows/OSystemWINDOWS.hxx
+++ b/src/windows/OSystemWINDOWS.hxx
@@ -39,7 +39,7 @@ class OSystemWINDOWS : public OSystem
     /**
       Destructor
     */
-    virtual ~OSystemWINDOWS();
+    virtual ~OSystemWINDOWS() = default;
 
   public:
     /**
diff --git a/src/windows/SettingsWINDOWS.cxx b/src/windows/SettingsWINDOWS.cxx
index 9db2504b6..55b99e7d2 100644
--- a/src/windows/SettingsWINDOWS.cxx
+++ b/src/windows/SettingsWINDOWS.cxx
@@ -25,8 +25,3 @@ SettingsWINDOWS::SettingsWINDOWS(OSystem& osystem)
 {
   setInternal("fragsize", "1024");
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SettingsWINDOWS::~SettingsWINDOWS()
-{
-}
diff --git a/src/windows/SettingsWINDOWS.hxx b/src/windows/SettingsWINDOWS.hxx
index f4bd6a0a4..edfe24f5c 100644
--- a/src/windows/SettingsWINDOWS.hxx
+++ b/src/windows/SettingsWINDOWS.hxx
@@ -35,7 +35,7 @@ class SettingsWINDOWS : public Settings
     /**
       Destructor
     */
-    virtual ~SettingsWINDOWS();
+    virtual ~SettingsWINDOWS() = default;
 
   private:
     // Following constructors and assignment operators not supported