diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc
index e5e9cbd97..588c5ce33 100644
--- a/src/buildings/helper/building-position-allocator.cc
+++ b/src/buildings/helper/building-position-allocator.cc
@@ -285,7 +285,8 @@ SameRoomPositionAllocator::AssignStreams (int64_t stream)
   return 1;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator)
+  ;
 
 
 FixedRoomPositionAllocator::FixedRoomPositionAllocator (
diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
index b6b3455af..7d2494732 100644
--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
@@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("A2A4RsrqHandoverAlgorithm");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm);
+NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm)
+  ;
 
 
 ///////////////////////////////////////////
diff --git a/src/lte/model/a3-rsrp-handover-algorithm.cc b/src/lte/model/a3-rsrp-handover-algorithm.cc
index 6c81fc855..1da66a368 100644
--- a/src/lte/model/a3-rsrp-handover-algorithm.cc
+++ b/src/lte/model/a3-rsrp-handover-algorithm.cc
@@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("A3RsrpHandoverAlgorithm");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm);
+NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm)
+  ;
 
 
 A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm ()
diff --git a/src/lte/model/lte-anr.cc b/src/lte/model/lte-anr.cc
index a7ae940cf..d1c823f59 100644
--- a/src/lte/model/lte-anr.cc
+++ b/src/lte/model/lte-anr.cc
@@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("LteAnr");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteAnr);
+NS_OBJECT_ENSURE_REGISTERED (LteAnr)
+  ;
 
 
 LteAnr::LteAnr (uint16_t servingCellId)
diff --git a/src/lte/model/lte-handover-algorithm.cc b/src/lte/model/lte-handover-algorithm.cc
index 6e0224a37..fe2c8774c 100644
--- a/src/lte/model/lte-handover-algorithm.cc
+++ b/src/lte/model/lte-handover-algorithm.cc
@@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("LteHandoverAlgorithm");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm);
+NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm)
+  ;
 
 
 LteHandoverAlgorithm::LteHandoverAlgorithm ()
diff --git a/src/lte/model/no-op-handover-algorithm.cc b/src/lte/model/no-op-handover-algorithm.cc
index 41b629639..6dddc851d 100644
--- a/src/lte/model/no-op-handover-algorithm.cc
+++ b/src/lte/model/no-op-handover-algorithm.cc
@@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("NoOpHandoverAlgorithm");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm);
+NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm)
+  ;
 
 
 NoOpHandoverAlgorithm::NoOpHandoverAlgorithm ()