diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 0a4408cbf0..71169893ea 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -19,7 +19,7 @@
 #include <AvatarHashMap.h>
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <ResourceCache.h>
 #include <SoundCache.h>
 #include <UUID.h>
diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index fd9e4f4f71..76d3716802 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -26,7 +26,7 @@
 #include <LogUtils.h>
 #include <LimitedNodeList.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <ShutdownEventListener.h>
 #include <SoundCache.h>
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 7855956763..166491a979 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -18,7 +18,7 @@
 #include "AssignmentClientMonitor.h"
 #include "AssignmentClientApp.h"
 #include "AssignmentClientChildData.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "SharedUtil.h"
 
 
diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp
index 4dafd64a92..c2f6f5c22c 100644
--- a/assignment-client/src/AssignmentFactory.cpp
+++ b/assignment-client/src/AssignmentFactory.cpp
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "Agent.h"
 #include "AssignmentFactory.h"
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 40c1a9d7ab..edb9db92fa 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -45,7 +45,7 @@
 #include <NodeList.h>
 #include <Node.h>
 #include <OctreeConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <StDev.h>
 #include <UUID.h>
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 0060b45f6e..e933982bb0 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -12,7 +12,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <UUID.h>
 
 #include "InjectedAudioStream.h"
diff --git a/assignment-client/src/audio/AvatarAudioStream.cpp b/assignment-client/src/audio/AvatarAudioStream.cpp
index 68f8f718de..fc14bcede6 100644
--- a/assignment-client/src/audio/AvatarAudioStream.cpp
+++ b/assignment-client/src/audio/AvatarAudioStream.cpp
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "AvatarAudioStream.h"
 
diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 487db1b380..4e5f7f91d4 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -20,7 +20,7 @@
 
 #include <LogHandler.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <UUID.h>
 #include <TryLocker.h>
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 197e9baf5e..44552f5ccd 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "AvatarMixerClientData.h"
 
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index 3e10b8473a..e45c0c9e54 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -22,7 +22,7 @@
 #include <AvatarData.h>
 #include <NodeData.h>
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SimpleMovingAverage.h>
 #include <UUIDHasher.h>
 
diff --git a/assignment-client/src/entities/EntityNodeData.h b/assignment-client/src/entities/EntityNodeData.h
index 054ceb07d3..d779a0b58d 100644
--- a/assignment-client/src/entities/EntityNodeData.h
+++ b/assignment-client/src/entities/EntityNodeData.h
@@ -12,7 +12,7 @@
 #ifndef hifi_EntityNodeData_h
 #define hifi_EntityNodeData_h
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "../octree/OctreeQueryNode.h"
 
diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
index 613eec18df..ebc18162d9 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
@@ -12,7 +12,7 @@
 #include <limits>
 
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PerfStat.h>
 
 #include "OctreeServer.h"
diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index 7df9604817..2f1a554b8c 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <cstdio>
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <UUID.h>
 
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 520b796e47..6a5d76d4b9 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -11,7 +11,7 @@
 
 #include <NodeList.h>
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PerfStat.h>
 
 #include "OctreeSendThread.h"
diff --git a/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp b/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
index 94249e7517..084fd13ab5 100644
--- a/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
+++ b/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
@@ -13,7 +13,7 @@
 
 #include <HifiSockAddr.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 
 #include "OctreeServerDatagramProcessor.h"
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index bb98bb1186..9cdac34c30 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -29,7 +29,7 @@
 #include <JSONBreakableMarshal.h>
 #include <LogUtils.h>
 #include <NetworkingConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SettingHandle.h>
 #include <SharedUtil.h>
 #include <ShutdownEventListener.h>
diff --git a/domain-server/src/DomainServerNodeData.cpp b/domain-server/src/DomainServerNodeData.cpp
index 0d7efa064c..795b2f4aef 100644
--- a/domain-server/src/DomainServerNodeData.cpp
+++ b/domain-server/src/DomainServerNodeData.cpp
@@ -14,7 +14,7 @@
 #include <QtCore/QVariant>
 
 #include <JSONBreakableMarshal.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "DomainServerNodeData.h"
 
diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 24199b8bb8..1e9e3e8ec4 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -12,7 +12,7 @@
 #include <QTimer>
 
 #include <LimitedNodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 
 #include "IceServer.h"
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 09f8e111ba..ee90d222c6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -81,7 +81,7 @@
 #include <ObjectMotionState.h>
 #include <OctalCode.h>
 #include <OctreeSceneStats.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <PhysicsEngine.h>
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 0131fdb19a..26b1e0caee 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -31,7 +31,7 @@
 #include <NodeList.h>
 #include <OctreeQuery.h>
 #include <OffscreenUi.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PhysicalEntitySimulation.h>
 #include <PhysicsEngine.h>
 #include <ScriptEngine.h>
@@ -48,7 +48,6 @@
 #include "FileLogger.h"
 #include "GLCanvas.h"
 #include "Menu.h"
-#include "PacketHeaders.h"
 #include "Physics.h"
 #include "Stars.h"
 #include "avatar/Avatar.h"
@@ -56,6 +55,7 @@
 #include "devices/SixenseManager.h"
 #include "scripting/ControllerScriptingInterface.h"
 #include "scripting/WebWindowClass.h"
+#include "udt/PacketHeaders.h"
 #include "ui/BandwidthDialog.h"
 #include "ui/HMDToolsDialog.h"
 #include "ui/ModelsBrowser.h"
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 3d4c158a0b..ca983287ad 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -28,7 +28,7 @@
 #include <LODManager.h>
 #include <NodeList.h>
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 1384f6e9ca..dc83d8e07f 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -26,7 +26,7 @@
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <ShapeCollider.h>
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 918e5e23db..23cfcd3000 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -50,7 +50,7 @@ extern "C" {
 #include <soxr.h>
 
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PositionalAudioStream.h>
 #include <SettingHandle.h>
 #include <SharedUtil.h>
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index ac11d8f8ca..4866bcfad6 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -13,7 +13,7 @@
 #include <QtCore/QDataStream>
 
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <UUID.h>
 #include <soxr.h>
diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp
index 8330414c4a..fc46d5fd66 100644
--- a/libraries/audio/src/AudioRingBuffer.cpp
+++ b/libraries/audio/src/AudioRingBuffer.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDebug>
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "AudioLogging.h"
 
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index 928662d2e8..9df083159f 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -12,7 +12,7 @@
 #include <glm/glm.hpp>
 
 #include "InboundAudioStream.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 
 const int STARVE_HISTORY_CAPACITY = 50;
 
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index cb8494f23e..65a0e5ddaa 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -14,7 +14,7 @@
 
 #include <NodeData.h>
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <StDev.h>
 
 #include "AudioRingBuffer.h"
diff --git a/libraries/audio/src/InjectedAudioStream.cpp b/libraries/audio/src/InjectedAudioStream.cpp
index b7e9a40942..e7633c49e7 100644
--- a/libraries/audio/src/InjectedAudioStream.cpp
+++ b/libraries/audio/src/InjectedAudioStream.cpp
@@ -14,7 +14,7 @@
 #include <QtCore/QDataStream>
 #include <QtCore/qdebug.h>
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <UUID.h>
 
 #include "InjectedAudioStream.h"
diff --git a/libraries/audio/src/MixedAudioStream.h b/libraries/audio/src/MixedAudioStream.h
index edb26c486f..e6c0339b2a 100644
--- a/libraries/audio/src/MixedAudioStream.h
+++ b/libraries/audio/src/MixedAudioStream.h
@@ -13,7 +13,7 @@
 #define hifi_MixedAudioStream_h
 
 #include "InboundAudioStream.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 
 class MixedAudioStream : public InboundAudioStream {
 public:
diff --git a/libraries/audio/src/PositionalAudioStream.cpp b/libraries/audio/src/PositionalAudioStream.cpp
index 7ca18db540..a916ccf2e3 100644
--- a/libraries/audio/src/PositionalAudioStream.cpp
+++ b/libraries/audio/src/PositionalAudioStream.cpp
@@ -18,7 +18,7 @@
 #include <QtCore/QDataStream>
 
 #include <Node.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <UUID.h>
 
 PositionalAudioStream::PositionalAudioStream(PositionalAudioStream::Type type, bool isStereo, const InboundAudioStream::Settings& settings) :
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 5ea3b4c669..06e05a9390 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -21,7 +21,7 @@
 
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <GLMHelpers.h>
 #include <StreamUtils.h>
 #include <UUID.h>
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 60eb5c4499..f2742b63ea 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -10,7 +10,7 @@
 //
 
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 
 #include "AvatarLogging.h"
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 0faba6541c..616e8f75d5 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <PerfStat.h>
 #include <OctalCode.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include "EntityEditPacketSender.h"
 #include "EntitiesLogging.h"
 #include "EntityItem.h"
diff --git a/libraries/entities/src/EntityItemID.cpp b/libraries/entities/src/EntityItemID.cpp
index d882559ee3..ab2c39324f 100644
--- a/libraries/entities/src/EntityItemID.cpp
+++ b/libraries/entities/src/EntityItemID.cpp
@@ -12,7 +12,7 @@
 #include <QtCore/QObject>
 #include <QDebug>
 #include <BufferParser.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "RegisteredMetaTypes.h"
 #include "EntityItemID.h"
diff --git a/libraries/entities/src/EntityTreeHeadlessViewer.h b/libraries/entities/src/EntityTreeHeadlessViewer.h
index fedbc74430..23c32546cb 100644
--- a/libraries/entities/src/EntityTreeHeadlessViewer.h
+++ b/libraries/entities/src/EntityTreeHeadlessViewer.h
@@ -12,7 +12,7 @@
 #ifndef hifi_EntityTreeHeadlessViewer_h
 #define hifi_EntityTreeHeadlessViewer_h
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <Octree.h>
 #include <OctreePacketData.h>
diff --git a/libraries/environment/src/EnvironmentData.cpp b/libraries/environment/src/EnvironmentData.cpp
index f703b667bc..2c6fe5b491 100644
--- a/libraries/environment/src/EnvironmentData.cpp
+++ b/libraries/environment/src/EnvironmentData.cpp
@@ -12,7 +12,7 @@
 #include <cstring>
 
 #include "EnvironmentData.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 
 // initial values from Sean O'Neil's GPU Gems entry (http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html),
 // GameEngine.cpp
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 2830a13ca7..4ded2216d0 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -24,7 +24,7 @@
 #include <SettingHandle.h>
 
 #include "NodeList.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "RSAKeypairGenerator.h"
 #include "SharedUtil.h"
 
diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp
index 3da1fb9a41..16d7b6a051 100644
--- a/libraries/networking/src/Assignment.cpp
+++ b/libraries/networking/src/Assignment.cpp
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "SharedUtil.h"
 #include "UUID.h"
 
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 38d1ade2ad..568c4b1e9b 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -16,7 +16,7 @@
 #include "Assignment.h"
 #include "HifiSockAddr.h"
 #include "NodeList.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "SharedUtil.h"
 #include "UserActivityLogger.h"
 #include "NetworkLogging.h"
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 8895f09675..d54fbd093b 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -33,6 +33,8 @@
 #include "UUID.h"
 #include "NetworkLogging.h"
 
+#include "udt/udt.h"
+
 const char SOLO_NODE_TYPES[2] = {
     NodeType::AvatarMixer,
     NodeType::AudioMixer
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 33f9ac9fd3..3d9f85aa08 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -38,7 +38,7 @@
 #include "DomainHandler.h"
 #include "Node.h"
 #include "NLPacket.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "NLPacketList.h"
 #include "UUIDHasher.h"
 
diff --git a/libraries/networking/src/NLPacket.h b/libraries/networking/src/NLPacket.h
index e70df1dad7..6c38f1eb2e 100644
--- a/libraries/networking/src/NLPacket.h
+++ b/libraries/networking/src/NLPacket.h
@@ -12,7 +12,7 @@
 #ifndef hifi_NLPacket_h
 #define hifi_NLPacket_h
 
-#include "Packet.h"
+#include "udt/Packet.h"
 
 class NLPacket : public Packet {
     Q_OBJECT
diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h
index 83bdf0ebd3..3bd79d01f0 100644
--- a/libraries/networking/src/Node.h
+++ b/libraries/networking/src/Node.h
@@ -24,7 +24,7 @@
 #include "NetworkPeer.h"
 #include "NodeData.h"
 #include "NodeType.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "SimpleMovingAverage.h"
 #include "MovingPercentile.h"
 
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index dd1d4bdc5f..3e6418c7f6 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -25,7 +25,7 @@
 #include "HifiSockAddr.h"
 #include "JSONBreakableMarshal.h"
 #include "NodeList.h"
-#include "PacketHeaders.h"
+#include "udt/PacketHeaders.h"
 #include "SharedUtil.h"
 #include "UUID.h"
 #include "NetworkLogging.h"
diff --git a/libraries/networking/src/udt/Packet.cpp b/libraries/networking/src/udt/Packet.cpp
index ca1c66f4ca..f7a52b068a 100644
--- a/libraries/networking/src/udt/Packet.cpp
+++ b/libraries/networking/src/udt/Packet.cpp
@@ -11,7 +11,7 @@
 
 #include "Packet.h"
 
-#include "LimitedNodeList.h"
+#include "../LimitedNodeList.h"
 
 qint64 Packet::localHeaderSize(PacketType::Value type) {
     qint64 size = numBytesForArithmeticCodedPacketType(type) + sizeof(PacketVersion) +
diff --git a/libraries/octree/src/JurisdictionListener.cpp b/libraries/octree/src/JurisdictionListener.cpp
index d725ce3555..735fcb0725 100644
--- a/libraries/octree/src/JurisdictionListener.cpp
+++ b/libraries/octree/src/JurisdictionListener.cpp
@@ -13,7 +13,7 @@
 
 #include <OctalCode.h>
 #include <SharedUtil.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include "JurisdictionListener.h"
 
 JurisdictionListener::JurisdictionListener(NodeType_t type) :
diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp
index d6e4ad8003..5fc735eb68 100644
--- a/libraries/octree/src/JurisdictionMap.cpp
+++ b/libraries/octree/src/JurisdictionMap.cpp
@@ -16,7 +16,7 @@
 
 #include <DependencyManager.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <OctalCode.h>
 
 #include "OctreeLogging.h"
diff --git a/libraries/octree/src/JurisdictionSender.cpp b/libraries/octree/src/JurisdictionSender.cpp
index 1ade2412b8..69ae76840e 100644
--- a/libraries/octree/src/JurisdictionSender.cpp
+++ b/libraries/octree/src/JurisdictionSender.cpp
@@ -13,7 +13,7 @@
 
 #include <OctalCode.h>
 #include <SharedUtil.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include "JurisdictionSender.h"
 
 
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index ca6cfcecba..810bfa6097 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -36,7 +36,7 @@
 #include <LogHandler.h>
 #include <NetworkAccessManager.h>
 #include <OctalCode.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <Shape.h>
 #include <PathUtils.h>
diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index 41b8b7bca6..6bbfdc5024 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -14,7 +14,7 @@
 #include <PerfStat.h>
 
 #include <OctalCode.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include "OctreeLogging.h"
 #include "OctreeEditPacketSender.h"
 
diff --git a/libraries/octree/src/OctreeEditPacketSender.h b/libraries/octree/src/OctreeEditPacketSender.h
index a1ba2f0675..34fed80e98 100644
--- a/libraries/octree/src/OctreeEditPacketSender.h
+++ b/libraries/octree/src/OctreeEditPacketSender.h
@@ -13,7 +13,7 @@
 #define hifi_OctreeEditPacketSender_h
 
 #include <PacketSender.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "JurisdictionMap.h"
 #include "SentPacketHistory.h"
diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h
index 70ee43be35..692b7e4848 100644
--- a/libraries/octree/src/OctreeHeadlessViewer.h
+++ b/libraries/octree/src/OctreeHeadlessViewer.h
@@ -12,7 +12,7 @@
 #ifndef hifi_OctreeHeadlessViewer_h
 #define hifi_OctreeHeadlessViewer_h
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 
 #include "JurisdictionListener.h"
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index 5ce44a0457..439a07087c 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -27,7 +27,7 @@
 #include <QUuid>
 
 #include <LimitedNodeList.h> // for MAX_PACKET_SIZE
-#include <PacketHeaders.h> // for MAX_PACKET_HEADER_BYTES
+#include <udt/PacketHeaders.h> // for MAX_PACKET_HEADER_BYTES
 #include <SharedUtil.h>
 #include <ShapeInfo.h>
 #include <BackgroundMode.h>
diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp
index 08197a587e..3bfa8c0fff 100644
--- a/libraries/octree/src/OctreeQuery.cpp
+++ b/libraries/octree/src/OctreeQuery.cpp
@@ -10,7 +10,7 @@
 //
 
 #include <GLMHelpers.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "OctreeConstants.h"
 #include "OctreeQuery.h"
diff --git a/libraries/octree/src/OctreeRenderer.h b/libraries/octree/src/OctreeRenderer.h
index f6c92f81c9..e470b088d1 100644
--- a/libraries/octree/src/OctreeRenderer.h
+++ b/libraries/octree/src/OctreeRenderer.h
@@ -17,7 +17,7 @@
 
 #include <QObject>
 
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <RenderArgs.h>
 #include <SharedUtil.h>
 
diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp
index c4367b43d8..3633f05e2d 100644
--- a/libraries/octree/src/OctreeSceneStats.cpp
+++ b/libraries/octree/src/OctreeSceneStats.cpp
@@ -15,7 +15,7 @@
 
 #include <LogHandler.h>
 #include <NumericalConstants.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 
 #include "OctreePacketData.h"
 #include "OctreeElement.h"
diff --git a/libraries/render-utils/src/Environment.cpp b/libraries/render-utils/src/Environment.cpp
index 411beca0ae..763bbc460a 100644
--- a/libraries/render-utils/src/Environment.cpp
+++ b/libraries/render-utils/src/Environment.cpp
@@ -17,7 +17,7 @@
 #include <GeometryUtil.h>
 #include <NumericalConstants.h>
 #include <OctreePacketData.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <PathUtils.h>
 #include <SharedUtil.h>
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 134766fb6b..1fc54fa35a 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -24,7 +24,7 @@
 #include <EntityScriptingInterface.h>
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
-#include <PacketHeaders.h>
+#include <udt/PacketHeaders.h>
 #include <UUID.h>
 
 #include "AnimationObject.h"