--- a/src/applications/onoff/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/applications/onoff/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -6,6 +6,7 @@
         'onoff-application.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'onoff'
     headers.source = [
         'onoff-application.h',
         ]

--- a/src/applications/packet-sink/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/applications/packet-sink/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -6,6 +6,7 @@
         'packet-sink.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'packet-sink'
     headers.source = [
         'packet-sink.h',
         ]

--- a/src/applications/udp-echo/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/applications/udp-echo/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -7,6 +7,7 @@
         'udp-echo-server.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'udp-echo'
     headers.source = [
         'udp-echo-client.h',
         'udp-echo-server.h',

--- a/src/common/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/common/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -17,6 +17,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'common'
     headers.source = [
         'buffer.h',
         'chunk-registry.h',

--- a/src/contrib/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/contrib/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -9,6 +9,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'contrib'
     headers.source = [
         'event-garbage-collector.h',
         'gnuplot.h',

--- a/src/core/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/core/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -67,6 +67,7 @@
             ])
     
     headers = bld.create_obj('ns3header')
+    headers.module = 'core'
     headers.source = [
         'system-wall-clock-ms.h',
         'empty.h',

--- a/src/devices/csma/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/devices/csma/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -10,6 +10,7 @@
         'csma-ipv4-topology.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'csma'
     headers.source = [
         'backoff.h',
         'csma-net-device.h',

--- a/src/devices/point-to-point/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/devices/point-to-point/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -9,6 +9,7 @@
         'point-to-point-topology.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'point-to-point'
     headers.source = [
         'point-to-point-net-device.h',
         'point-to-point-channel.h',

--- a/src/devices/wifi/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/devices/wifi/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -38,6 +38,7 @@
         'constant-rate-wifi-manager.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'wifi'
     headers.source = [
         'propagation-delay-model.h',
         'propagation-loss-model.h',

--- a/src/internet-node/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/internet-node/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -36,6 +36,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'internet-node'
     headers.source = [
         'internet-node.h',
         'ascii-trace.h',

--- a/src/mobility/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/mobility/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -19,6 +19,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'mobility'
     headers.source = [
         'vector.h',
         'hierarchical-mobility-model.h',

--- a/src/node/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/node/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -31,6 +31,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'node'
     headers.source = [
         'address.h',
         'mac48-address.h',

--- a/src/routing/global-routing/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/routing/global-routing/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -9,6 +9,7 @@
         'candidate-queue.cc',
         ]
     headers = bld.create_obj('ns3header')
+    headers.module = 'global-routing'
     headers.source = [
         'global-router-interface.h',
         'global-route-manager.h',

--- a/src/routing/olsr/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/routing/olsr/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -12,6 +12,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'olsr'
     headers.source = [
         'olsr-agent.h',
         'olsr-header.h',

--- a/src/simulator/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/simulator/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -63,6 +63,7 @@
         ]
 
     headers = bld.create_obj('ns3header')
+    headers.module = 'simulator'
     headers.source = [
         'high-precision.h',
         'nstime.h',

--- a/src/wscript	Fri Mar 14 16:37:02 2008 -0700
+++ b/src/wscript	Wed Dec 26 13:40:39 2007 +0000
@@ -81,11 +81,14 @@
         self.inst_var = 'INCLUDEDIR'
         self.inst_dir = 'ns3'
         self.sub_dir = None # if not None, header files will be published as ns3/sub_dir/file.h
+        self.module = None # module name
         self.env = env
         if not self.env:
             self.env = Params.g_build.m_allenvs['default']
 
     def apply(self):
+        if self.module is None:
+            Params.fatal("'module' missing on ns3headers object %s" % self)
         ns3_dir_node = Params.g_build.m_srcnode.find_dir("ns3")
         if self.sub_dir is not None:
             ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)