--- a/src/mobility/model/waypoint-mobility-model.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/mobility/model/waypoint-mobility-model.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -27,9 +27,9 @@
 #include "ns3/config.h"
 #include "ns3/test.h"
 
-NS_LOG_COMPONENT_DEFINE ("WaypointMobilityModel");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("WaypointMobilityModel");
 
 NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel);