diff --git a/src/contrib/wscript b/src/contrib/wscript
index f63225935..046958dda 100644
--- a/src/contrib/wscript
+++ b/src/contrib/wscript
@@ -30,7 +30,6 @@ def build(bld):
         'attribute-default-iterator.cc',
         'file-config.cc',
         'raw-text-config.cc',
-        'packetbb.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -42,7 +41,6 @@ def build(bld):
         'file-config.h',
         'config-store.h',
         'flow-id-tag.h',
-        'packetbb.h',
         ]
 
     if bld.env['ENABLE_GTK_CONFIG_STORE']:
diff --git a/src/node/packetbb.h b/src/node/packetbb.h
index aaffcb018..fd5ee6570 100644
--- a/src/node/packetbb.h
+++ b/src/node/packetbb.h
@@ -35,11 +35,8 @@
 namespace ns3 {
 
 /* Forward declare objects */
-class PbbPacket;
 class PbbMessage;
 class PbbAddressBlock;
-class PbbTlvBlock;
-class PbbAddressTlvBlock;
 class PbbTlv;
 class PbbAddressTlv;
 
diff --git a/src/node/wscript b/src/node/wscript
index 1430e63ef..416db3879 100644
--- a/src/node/wscript
+++ b/src/node/wscript
@@ -45,6 +45,7 @@ def build(bld):
         'ipv6.cc',
         'ipv6-raw-socket-factory.cc',
         'ipv6-routing-protocol.cc',
+        'packetbb.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -91,4 +92,5 @@ def build(bld):
         'ipv6.h',
         'ipv6-raw-socket-factory.h',
         'ipv6-routing-protocol.h',
+        'packetbb.h',
         ]