diff --git a/src/cheat/BankRomCheat.hxx b/src/cheat/BankRomCheat.hxx
index b4ef523a4..b31d9a20d 100644
--- a/src/cheat/BankRomCheat.hxx
+++ b/src/cheat/BankRomCheat.hxx
@@ -26,7 +26,7 @@ class BankRomCheat : public Cheat
 {
   public:
     BankRomCheat(OSystem& os, const string& name, const string& code);
-    virtual ~BankRomCheat() { }
+    virtual ~BankRomCheat() = default;
 
     bool enable() override;
     bool disable() override;
diff --git a/src/cheat/Cheat.hxx b/src/cheat/Cheat.hxx
index ad205c703..6a9838d17 100644
--- a/src/cheat/Cheat.hxx
+++ b/src/cheat/Cheat.hxx
@@ -33,7 +33,7 @@ class Cheat
         myCode(code),
         myEnabled(false)
     { }
-    virtual ~Cheat() { }
+    virtual ~Cheat() = default;
 
     bool enabled() const { return myEnabled; }
     const string& name() const { return myName; }
diff --git a/src/cheat/CheetahCheat.hxx b/src/cheat/CheetahCheat.hxx
index 8419b1d05..191fea875 100644
--- a/src/cheat/CheetahCheat.hxx
+++ b/src/cheat/CheetahCheat.hxx
@@ -26,7 +26,7 @@ class CheetahCheat : public Cheat
 {
   public:
     CheetahCheat(OSystem& os, const string& name, const string& code);
-    virtual ~CheetahCheat() { }
+    virtual ~CheetahCheat() = default;
 
     bool enable() override;
     bool disable() override;
diff --git a/src/cheat/RamCheat.hxx b/src/cheat/RamCheat.hxx
index fd354900a..614f24cc3 100644
--- a/src/cheat/RamCheat.hxx
+++ b/src/cheat/RamCheat.hxx
@@ -26,7 +26,7 @@ class RamCheat : public Cheat
 {
   public:
     RamCheat(OSystem& os, const string& name, const string& code);
-    virtual ~RamCheat() { }
+    virtual ~RamCheat() = default;
 
     bool enable() override;
     bool disable() override;
diff --git a/src/common/EventHandlerSDL2.cxx b/src/common/EventHandlerSDL2.cxx
index a2a74b52d..b1e1cd390 100644
--- a/src/common/EventHandlerSDL2.cxx
+++ b/src/common/EventHandlerSDL2.cxx
@@ -26,11 +26,6 @@ EventHandlerSDL2::EventHandlerSDL2(OSystem& osystem)
 {
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-EventHandlerSDL2::~EventHandlerSDL2()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void EventHandlerSDL2::enableTextEvents(bool enable)
 {
diff --git a/src/common/EventHandlerSDL2.hxx b/src/common/EventHandlerSDL2.hxx
index 2e16fd09d..4a29167b7 100644
--- a/src/common/EventHandlerSDL2.hxx
+++ b/src/common/EventHandlerSDL2.hxx
@@ -42,7 +42,7 @@ class EventHandlerSDL2 : public EventHandler
     /**
       Destructor
     */
-    virtual ~EventHandlerSDL2();
+    virtual ~EventHandlerSDL2() = default;
 
   private:
     /**
diff --git a/src/common/SoundNull.hxx b/src/common/SoundNull.hxx
index 931c6dcef..c9e498081 100644
--- a/src/common/SoundNull.hxx
+++ b/src/common/SoundNull.hxx
@@ -48,7 +48,7 @@ class SoundNull : public Sound
     /**
       Destructor
     */
-    virtual ~SoundNull() { }
+    virtual ~SoundNull() = default;
 
   public: 
     /**
diff --git a/src/common/Vec.hxx b/src/common/Vec.hxx
index b40eabee0..fa753a6d6 100644
--- a/src/common/Vec.hxx
+++ b/src/common/Vec.hxx
@@ -24,19 +24,19 @@
 
 namespace Vec {
 
-template <class T>
+template<class T>
 void append(vector<T>& dst, const vector<T>& src)
 {
   dst.insert(dst.end(), src.begin(), src.end());
 }
 
-template <class T>
+template<class T>
 void insertAt(vector<T>& dst, uInt32 idx, const T& element)
 {
   dst.insert(dst.begin()+idx, element);
 }
 
-template <class T>
+template<class T>
 void removeAt(vector<T>& dst, uInt32 idx)
 {
   dst.erase(dst.begin()+idx);