--- a/samples/main-grid-topology.cc	Mon Mar 24 13:57:14 2008 -0700
+++ b/samples/main-grid-topology.cc	Mon Mar 24 13:57:26 2008 -0700
@@ -1,13 +1,9 @@
 /* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 
-#include "ns3/ptr.h"
-#include "ns3/node.h"
-#include "ns3/command-line.h"
-#include "ns3/mobility-model.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/uinteger.h"
-#include "ns3/double.h"
-#include "ns3/string.h"
+#include "ns3/core-module.h"
+#include "ns3/helper-module.h"
+#include "ns3/mobility-module.h"
+
 
 using namespace ns3;
 

--- a/samples/main-random-topology.cc	Mon Mar 24 13:57:14 2008 -0700
+++ b/samples/main-random-topology.cc	Mon Mar 24 13:57:26 2008 -0700
@@ -1,17 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 
-#include <vector>
-
-#include "ns3/ptr.h"
-#include "ns3/mobility-model.h"
-#include "ns3/command-line.h"
-#include "ns3/simulator.h"
-#include "ns3/nstime.h"
-#include "ns3/node.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/node-list.h"
-#include "ns3/string.h"
-#include "ns3/config.h"
+#include "ns3/core-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/helper-module.h"
 
 using namespace ns3;
 

--- a/samples/main-random-walk.cc	Mon Mar 24 13:57:14 2008 -0700
+++ b/samples/main-random-walk.cc	Mon Mar 24 13:57:26 2008 -0700
@@ -1,18 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 
-#include <vector>
-
-#include "ns3/ptr.h"
-#include "ns3/mobility-model.h"
-#include "ns3/position-allocator.h"
-#include "ns3/command-line.h"
-#include "ns3/simulator.h"
-#include "ns3/nstime.h"
-#include "ns3/node.h"
-#include "ns3/node-list.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/string.h"
-#include "ns3/config.h"
+#include "ns3/core-module.h"
+#include "ns3/helper-module.h"
+#include "ns3/mobility-module.h"
 
 using namespace ns3;