--- a/src/wave/model/bsm-application.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/bsm-application.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::BsmApplication")
     .SetParent<Application> ()
+    .SetGroupName ("Wave")
     .AddConstructor<BsmApplication> ()
     ;
   return tid;

--- a/src/wave/model/channel-coordinator.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/channel-coordinator.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelCoordinator")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<ChannelCoordinator> ()
     .AddAttribute ("CchInterval", "CCH Interval, default value is 50ms.",
                    TimeValue (GetDefaultCchInterval ()),

--- a/src/wave/model/channel-manager.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/channel-manager.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<ChannelManager> ()
   ;
   return tid;

--- a/src/wave/model/channel-scheduler.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/channel-scheduler.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelScheduler")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
   ;
   return tid;
 }

--- a/src/wave/model/default-channel-scheduler.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/default-channel-scheduler.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::DefaultChannelScheduler")
     .SetParent<ChannelScheduler> ()
+    .SetGroupName ("Wave")
     .AddConstructor<DefaultChannelScheduler> ()
   ;
   return tid;

--- a/src/wave/model/higher-tx-tag.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/higher-tx-tag.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::HigherLayerTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wave")
     .AddConstructor<HigherLayerTxVectorTag> ()
   ;
   return tid;

--- a/src/wave/model/ocb-wifi-mac.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/ocb-wifi-mac.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::OcbWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wave")
     .AddConstructor<OcbWifiMac> ()
   ;
   return tid;

--- a/src/wave/model/vendor-specific-action.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/vendor-specific-action.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -247,6 +247,7 @@
 {
   static TypeId tid = TypeId ("ns3::VendorSpecificActionHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wave")
     .AddConstructor<VendorSpecificActionHeader> ()
   ;
 

--- a/src/wave/model/vsa-manager.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/vsa-manager.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::VsaManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<VsaManager> ()
   ;
   return tid;

--- a/src/wave/model/wave-mac-low.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/wave-mac-low.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveMacLow")
     .SetParent<MacLow> ()
+    .SetGroupName ("Wave")
     .AddConstructor<WaveMacLow> ()
   ;
   return tid;

--- a/src/wave/model/wave-net-device.cc	Thu Apr 16 21:10:21 2015 -0700
+++ b/src/wave/model/wave-net-device.cc	Thu Apr 16 21:29:05 2015 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Wave")
     .AddConstructor<WaveNetDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (MAX_MSDU_SIZE - LLC_SNAP_HEADER_LENGTH),