diff --git a/src/node/ipv4-packet-info-tag.cc b/src/internet-stack/ipv4-packet-info-tag.cc
similarity index 100%
rename from src/node/ipv4-packet-info-tag.cc
rename to src/internet-stack/ipv4-packet-info-tag.cc
diff --git a/src/node/ipv4-packet-info-tag.h b/src/internet-stack/ipv4-packet-info-tag.h
similarity index 100%
rename from src/node/ipv4-packet-info-tag.h
rename to src/internet-stack/ipv4-packet-info-tag.h
diff --git a/src/node/ipv6-packet-info-tag.cc b/src/internet-stack/ipv6-packet-info-tag.cc
similarity index 100%
rename from src/node/ipv6-packet-info-tag.cc
rename to src/internet-stack/ipv6-packet-info-tag.cc
diff --git a/src/node/ipv6-packet-info-tag.h b/src/internet-stack/ipv6-packet-info-tag.h
similarity index 100%
rename from src/node/ipv6-packet-info-tag.h
rename to src/internet-stack/ipv6-packet-info-tag.h
diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript
index 8ad67ff70..a01448f94 100644
--- a/src/internet-stack/wscript
+++ b/src/internet-stack/wscript
@@ -145,6 +145,8 @@ def build(bld):
         'tcp-newreno.cc',
         'tcp-rx-buffer.cc',
         'tcp-tx-buffer.cc',
+        'ipv4-packet-info-tag.cc',
+        'ipv6-packet-info-tag.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -172,6 +174,8 @@ def build(bld):
         'ipv6-interface.h',
         'ndisc-cache.h',
         'loopback-net-device.h',
+        'ipv4-packet-info-tag.h',
+        'ipv6-packet-info-tag.h',
        ]
 
     if bld.env['NSC_ENABLED']:
diff --git a/src/node/wscript b/src/node/wscript
index 8c9764d85..20f7ea6e3 100644
--- a/src/node/wscript
+++ b/src/node/wscript
@@ -51,8 +51,6 @@ def build(bld):
         'radiotap-header.cc',
         'spectrum-phy.cc',
         'spectrum-channel.cc',        
-        'ipv4-packet-info-tag.cc',
-        'ipv6-packet-info-tag.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -105,6 +103,4 @@ def build(bld):
         'spectrum-phy.h',
         'spectrum-channel.h',
         'phy-mac.h',
-        'ipv4-packet-info-tag.h',
-        'ipv6-packet-info-tag.h',
         ]