diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 3a837f39..8ba4b972 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -390,6 +390,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -451,6 +455,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -511,6 +519,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -570,6 +582,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -627,6 +643,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -683,6 +703,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -738,6 +762,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -792,6 +820,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -844,6 +876,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -895,6 +931,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -945,6 +985,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -994,6 +1038,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1041,6 +1089,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1087,6 +1139,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1132,6 +1188,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1176,6 +1236,10 @@ namespace etl
     }
 
   protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1216,6 +1280,12 @@ namespace etl
       : ifsm_state(STATE_ID)
     {
     }
+  
+  protected:
+      
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
diff --git a/include/etl/fsm_generator.h b/include/etl/fsm_generator.h
index a937542e..176fa60d 100644
--- a/include/etl/fsm_generator.h
+++ b/include/etl/fsm_generator.h
@@ -411,6 +411,10 @@ namespace etl
   cog.outl("")
   cog.outl("protected:")
   cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
   cog.outl("  inline TContext& get_fsm_context() const")
   cog.outl("  {")
   cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
@@ -484,6 +488,10 @@ namespace etl
       cog.outl("")
       cog.outl("protected:")
       cog.outl("")
+      cog.outl("  ~fsm_state()")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
       cog.outl("  inline TContext& get_fsm_context() const")
       cog.outl("  {")
       cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
@@ -538,6 +546,12 @@ namespace etl
   cog.outl("  {")
   cog.outl("  }")
   cog.outl("")
+  cog.outl("protected:")
+  cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
   cog.outl("  inline TContext& get_fsm_context() const")
   cog.outl("  {")
   cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
diff --git a/include/etl/observer.h b/include/etl/observer.h
index b9c0dbfa..1cc9786a 100644
--- a/include/etl/observer.h
+++ b/include/etl/observer.h
@@ -179,6 +179,12 @@ namespace etl
       }
     }
 
+  protected:
+      
+    ~observable()
+    {
+    }
+	  
   private:
 
     /// The list of observers.