diff --git a/src/devices/wimax/packet-burst.cc b/src/common/packet-burst.cc
similarity index 100%
rename from src/devices/wimax/packet-burst.cc
rename to src/common/packet-burst.cc
diff --git a/src/devices/wimax/packet-burst.h b/src/common/packet-burst.h
similarity index 100%
rename from src/devices/wimax/packet-burst.h
rename to src/common/packet-burst.h
diff --git a/src/common/wscript b/src/common/wscript
index 35f8ffd95..a31cca366 100644
--- a/src/common/wscript
+++ b/src/common/wscript
@@ -7,6 +7,7 @@ def build(bld):
         'packet-metadata.cc',
         'packet-metadata-test.cc',
         'packet.cc',
+        'packet-burst.cc',
         'chunk.cc',
         'header.cc',
         'trailer.cc',
@@ -36,6 +37,7 @@ def build(bld):
         'header.h',
         'trailer.h',
         'packet.h',
+        'packet-burst.h',
         'packet-metadata.h',
         'data-rate.h',
         'error-model.h',
diff --git a/src/devices/wimax/bs-net-device.cc b/src/devices/wimax/bs-net-device.cc
index 4244aba01..9017c01dc 100644
--- a/src/devices/wimax/bs-net-device.cc
+++ b/src/devices/wimax/bs-net-device.cc
@@ -26,7 +26,7 @@
 #include "bs-uplink-scheduler.h"
 #include "bs-net-device.h"
 #include "wimax-phy.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "ss-record.h"
 #include "bs-scheduler.h"
 #include "wimax-mac-queue.h"
diff --git a/src/devices/wimax/bs-scheduler-rtps.cc b/src/devices/wimax/bs-scheduler-rtps.cc
index 358230a2a..9aa5afceb 100644
--- a/src/devices/wimax/bs-scheduler-rtps.cc
+++ b/src/devices/wimax/bs-scheduler-rtps.cc
@@ -22,7 +22,7 @@
 #include "bs-scheduler-rtps.h"
 #include "ns3/simulator.h"
 #include "bs-net-device.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "cid.h"
 #include "wimax-mac-header.h"
 #include "ss-record.h"
diff --git a/src/devices/wimax/bs-scheduler-rtps.h b/src/devices/wimax/bs-scheduler-rtps.h
index 927800e50..9abf6ea02 100644
--- a/src/devices/wimax/bs-scheduler-rtps.h
+++ b/src/devices/wimax/bs-scheduler-rtps.h
@@ -27,7 +27,7 @@
 #include <list>
 #include "ns3/packet.h"
 #include "wimax-phy.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "dl-mac-messages.h"
 #include "bs-scheduler.h"
 
diff --git a/src/devices/wimax/bs-scheduler-simple.cc b/src/devices/wimax/bs-scheduler-simple.cc
index 0b0c74f23..653a663a4 100644
--- a/src/devices/wimax/bs-scheduler-simple.cc
+++ b/src/devices/wimax/bs-scheduler-simple.cc
@@ -21,7 +21,7 @@
 #include "bs-scheduler-simple.h"
 #include "ns3/simulator.h"
 #include "bs-net-device.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "cid.h"
 #include "wimax-mac-header.h"
 #include "ss-record.h"
diff --git a/src/devices/wimax/bs-scheduler-simple.h b/src/devices/wimax/bs-scheduler-simple.h
index 261f68e6a..c642b9148 100644
--- a/src/devices/wimax/bs-scheduler-simple.h
+++ b/src/devices/wimax/bs-scheduler-simple.h
@@ -26,7 +26,7 @@
 #include <list>
 #include "ns3/packet.h"
 #include "wimax-phy.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "dl-mac-messages.h"
 #include "bs-scheduler.h"
 
diff --git a/src/devices/wimax/bs-scheduler.cc b/src/devices/wimax/bs-scheduler.cc
index 61a1d3e72..56603bd51 100644
--- a/src/devices/wimax/bs-scheduler.cc
+++ b/src/devices/wimax/bs-scheduler.cc
@@ -21,7 +21,7 @@
 #include "bs-scheduler.h"
 #include "ns3/simulator.h"
 #include "bs-net-device.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "cid.h"
 #include "wimax-mac-header.h"
 #include "ss-record.h"
diff --git a/src/devices/wimax/bs-scheduler.h b/src/devices/wimax/bs-scheduler.h
index 539dbcf9d..5ff10f469 100644
--- a/src/devices/wimax/bs-scheduler.h
+++ b/src/devices/wimax/bs-scheduler.h
@@ -26,7 +26,7 @@
 #include <list>
 #include "ns3/packet.h"
 #include "wimax-phy.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "dl-mac-messages.h"
 #include "service-flow.h"
 
diff --git a/src/devices/wimax/send-params.h b/src/devices/wimax/send-params.h
index 9ae315489..60e56d387 100644
--- a/src/devices/wimax/send-params.h
+++ b/src/devices/wimax/send-params.h
@@ -57,7 +57,7 @@ private:
 #define OFDM_SEND_PARAMS_H
 
 #include <stdint.h>
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 
 namespace ns3 {
 
diff --git a/src/devices/wimax/simple-ofdm-wimax-phy.cc b/src/devices/wimax/simple-ofdm-wimax-phy.cc
index 5908dee88..b3447d486 100644
--- a/src/devices/wimax/simple-ofdm-wimax-phy.cc
+++ b/src/devices/wimax/simple-ofdm-wimax-phy.cc
@@ -28,7 +28,7 @@
 #include "wimax-net-device.h"
 #include "simple-ofdm-wimax-phy.h"
 #include "wimax-channel.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "wimax-mac-header.h"
 #include "simple-ofdm-wimax-channel.h"
 #include "ns3/trace-source-accessor.h"
diff --git a/src/devices/wimax/ss-net-device.cc b/src/devices/wimax/ss-net-device.cc
index 6bbf1bfa9..526643c9a 100644
--- a/src/devices/wimax/ss-net-device.cc
+++ b/src/devices/wimax/ss-net-device.cc
@@ -25,7 +25,7 @@
 #include "ns3/node.h"
 #include "ss-net-device.h"
 #include "wimax-phy.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include <algorithm>
 #include "dl-mac-messages.h"
 #include "ul-mac-messages.h"
diff --git a/src/devices/wimax/ss-scheduler.h b/src/devices/wimax/ss-scheduler.h
index e50d25e04..96aba72f8 100644
--- a/src/devices/wimax/ss-scheduler.h
+++ b/src/devices/wimax/ss-scheduler.h
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 #include "ns3/packet.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "wimax-phy.h"
 #include "wimax-mac-header.h"
 
diff --git a/src/devices/wimax/wimax-net-device.cc b/src/devices/wimax/wimax-net-device.cc
index af3b15852..20e79a187 100644
--- a/src/devices/wimax/wimax-net-device.cc
+++ b/src/devices/wimax/wimax-net-device.cc
@@ -27,7 +27,7 @@
 #include "ns3/packet.h"
 #include "wimax-net-device.h"
 #include "wimax-channel.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "burst-profile-manager.h"
 #include <list>
 #include "send-params.h"
diff --git a/src/devices/wimax/wimax-phy.cc b/src/devices/wimax/wimax-phy.cc
index 168f1b355..073c9104a 100644
--- a/src/devices/wimax/wimax-phy.cc
+++ b/src/devices/wimax/wimax-phy.cc
@@ -24,7 +24,7 @@
 #include "wimax-net-device.h"
 #include "wimax-phy.h"
 #include "wimax-channel.h"
-#include "packet-burst.h"
+#include "ns3/packet-burst.h"
 #include "ns3/trace-source-accessor.h"
 #include "ns3/pointer.h"
 #include "ns3/uinteger.h"
diff --git a/src/devices/wimax/wscript b/src/devices/wimax/wscript
index cb040c4a9..d4f629bb7 100644
--- a/src/devices/wimax/wscript
+++ b/src/devices/wimax/wscript
@@ -8,7 +8,6 @@ def build(bld):
             'bs-net-device.cc',
             'ss-net-device.cc',
             'wimax-mac-header.cc',
-            'packet-burst.cc',
             'wimax-phy.cc',
             'wimax-channel.cc',
             'ofdm-downlink-frame-prefix.cc',
@@ -79,7 +78,6 @@ def build(bld):
             'simple-ofdm-wimax-channel.h',          
             'send-params.h',
             'service-flow.h',
-            'packet-burst.h',
             'ss-manager.h',
             'connection-manager.h',
             'wimax-mac-header.h',