diff --git a/src/mobility/ns2-mobility-helper.cc b/src/helper/ns2-mobility-helper.cc
similarity index 98%
rename from src/mobility/ns2-mobility-helper.cc
rename to src/helper/ns2-mobility-helper.cc
index 373dcdeef..704fb2897 100644
--- a/src/mobility/ns2-mobility-helper.cc
+++ b/src/helper/ns2-mobility-helper.cc
@@ -24,9 +24,9 @@
 #include "ns3/simulator.h"
 #include "ns3/node-list.h"
 #include "ns3/node.h"
+#include "ns3/static-speed-mobility-model.h"
+#include "ns3/mobility-model-notifier.h"
 #include "ns2-mobility-helper.h"
-#include "static-speed-mobility-model.h"
-#include "mobility-model-notifier.h"
 
 NS_LOG_COMPONENT_DEFINE ("Ns2MobilityHelper");
 
diff --git a/src/mobility/ns2-mobility-helper.h b/src/helper/ns2-mobility-helper.h
similarity index 98%
rename from src/mobility/ns2-mobility-helper.h
rename to src/helper/ns2-mobility-helper.h
index 7f7580861..5270ed4b4 100644
--- a/src/mobility/ns2-mobility-helper.h
+++ b/src/helper/ns2-mobility-helper.h
@@ -25,10 +25,11 @@
 #include <stdint.h>
 #include "ns3/ptr.h"
 #include "ns3/object.h"
-#include "static-speed-mobility-model.h"
 
 namespace ns3 {
 
+class StaticSpeedMobilityModel;
+
 /**
  * \brief a topology object which can read ns2's movement files
  *        generated by the CMU setdest tool.
diff --git a/src/helper/wscript b/src/helper/wscript
index 4fb663fa6..c8a825d0e 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -10,6 +10,7 @@ def build(bld):
         'point-to-point-helper.cc',
         'csma-helper.cc',
         'mobility-helper.cc',
+        'ns2-mobility-helper.cc',
         ]
 
     headers = bld.create_obj('ns3header')
@@ -22,4 +23,5 @@ def build(bld):
         'point-to-point-helper.h',
         'csma-helper.h',
         'mobility-helper.h',
+        'ns2-mobility-helper.h',
         ]
diff --git a/src/mobility/wscript b/src/mobility/wscript
index d4c0f6cf5..bd022f38a 100644
--- a/src/mobility/wscript
+++ b/src/mobility/wscript
@@ -15,7 +15,6 @@ def build(bld):
         'random-waypoint-mobility-model.cc',
         'random-walk-2d-mobility-model.cc',
         'random-direction-2d-mobility-model.cc',
-        'ns2-mobility-helper.cc',
         ]
 
     headers = bld.create_obj('ns3header')
@@ -33,5 +32,4 @@ def build(bld):
         'random-waypoint-mobility-model.h',
         'random-walk-2d-mobility-model.h',
         'random-direction-2d-mobility-model.h',
-        'ns2-mobility-helper.h',
         ]