diff --git a/src/devices/mesh/dot11s/ie-dot11s-id.cc b/src/devices/mesh/dot11s/ie-dot11s-id.cc
index f69fbb8c8..29db0d052 100644
--- a/src/devices/mesh/dot11s/ie-dot11s-id.cc
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.cc
@@ -134,9 +134,7 @@ operator== (const IeMeshId & a, const IeMeshId & b)
       size++;
     }
   return result;
-}
-;
-
+};
 std::ostream &
 operator << (std::ostream &os, const IeMeshId &meshId)
 {
diff --git a/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc b/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc
index 46458c697..d43f6f3e6 100644
--- a/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc
+++ b/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc
@@ -74,9 +74,7 @@ bool
 operator== (const IeLinkMetricReport & a, const IeLinkMetricReport & b)
 {
   return (a.m_metric == b.m_metric);
-}
-;
-
+};
 #ifdef RUN_SELF_TESTS
 
 /// Built-in self test for IeLinkMetricReport
diff --git a/src/devices/mesh/dot11s/ie-dot11s-perr.cc b/src/devices/mesh/dot11s/ie-dot11s-perr.cc
index d08a7930f..8f24a96ff 100644
--- a/src/devices/mesh/dot11s/ie-dot11s-perr.cc
+++ b/src/devices/mesh/dot11s/ie-dot11s-perr.cc
@@ -159,38 +159,38 @@ operator== (const IePerr & a, const IePerr & b)
 
 /// Built-in self test for IePreq
 struct IePerrBist : public IeTest
-  {
-    IePerrBist () :
+{
+  IePerrBist () :
     IeTest ("Mesh/802.11s/IE/PERR")
-      {
-      }
-    virtual bool
-    RunTests ();
-  };
+  {
+  }
+  virtual bool
+  RunTests ();
+};
 
 /// Test instance
 static IePerrBist g_IePerrBist;
 
 bool
 IePerrBist::RunTests ()
-  {
-    bool result (true);
-    // create test information element
-    IePerr a;
-    IePerr::FailedDestination dest;
-    dest.destination = Mac48Address ("11:22:33:44:55:66");
-    dest.seqnum = 1;
-    a.AddAddressUnit (dest);
-    dest.destination = Mac48Address ("10:20:30:40:50:60");
-    dest.seqnum = 2;
-    a.AddAddressUnit (dest);
-    dest.destination = Mac48Address ("01:02:03:04:05:06");
-    dest.seqnum = 3;
-    a.AddAddressUnit (dest);
+{
+  bool result (true);
+  // create test information element
+  IePerr a;
+  IePerr::FailedDestination dest;
+  dest.destination = Mac48Address ("11:22:33:44:55:66");
+  dest.seqnum = 1;
+  a.AddAddressUnit (dest);
+  dest.destination = Mac48Address ("10:20:30:40:50:60");
+  dest.seqnum = 2;
+  a.AddAddressUnit (dest);
+  dest.destination = Mac48Address ("01:02:03:04:05:06");
+  dest.seqnum = 3;
+  a.AddAddressUnit (dest);
 
-    result = result && TestRoundtripSerialization (a);
-    return result;
-  }
+  result = result && TestRoundtripSerialization (a);
+  return result;
+}
 
 #endif // RUN_SELF_TESTS
 } // namespace dot11s
diff --git a/src/devices/mesh/dot11s/ie-dot11s-prep.cc b/src/devices/mesh/dot11s/ie-dot11s-prep.cc
index 40afa2497..00fcccd73 100644
--- a/src/devices/mesh/dot11s/ie-dot11s-prep.cc
+++ b/src/devices/mesh/dot11s/ie-dot11s-prep.cc
@@ -188,8 +188,7 @@ IePrep::GetInformationSize () const
       + 6 //Originator address
       + 4; //Originator seqno
   return retval;
-}
-;
+};
 void
 IePrep::PrintInformation (std::ostream& os) const
 {
@@ -215,8 +214,7 @@ struct IePrepBist : public IeTest
   IePrepBist () :
     IeTest ("Mesh/802.11s/IE/PREP")
   {
-  }
-  ;
+  };
   virtual bool
   RunTests ();
 };