diff --git a/targets/platform/IPlatformLeaderboard.h b/targets/app/common/Leaderboards/IPlatformLeaderboard.h
similarity index 100%
rename from targets/platform/IPlatformLeaderboard.h
rename to targets/app/common/Leaderboards/IPlatformLeaderboard.h
diff --git a/targets/app/common/Leaderboards/LeaderboardManager.h b/targets/app/common/Leaderboards/LeaderboardManager.h
index 6c65ec98b..183b7234d 100644
--- a/targets/app/common/Leaderboards/LeaderboardManager.h
+++ b/targets/app/common/Leaderboards/LeaderboardManager.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "platform/IPlatformLeaderboard.h"
+#include "app/common/Leaderboards/IPlatformLeaderboard.h"
 
 class LeaderboardManager : public IPlatformLeaderboard {
 public:
diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h
index 93ceff24c..ed9635052 100644
--- a/targets/app/common/Network/GameNetworkManager.h
+++ b/targets/app/common/Network/GameNetworkManager.h
@@ -8,7 +8,7 @@
 #include <qnet.h>
 #endif
 #include "platform/PlatformTypes.h"
-#include "platform/IPlatformNetwork.h"
+#include "app/common/Network/IPlatformNetwork.h"
 #include "platform/NetTypes.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
diff --git a/targets/platform/IPlatformNetwork.h b/targets/app/common/Network/IPlatformNetwork.h
similarity index 100%
rename from targets/platform/IPlatformNetwork.h
rename to targets/app/common/Network/IPlatformNetwork.h
diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h
index 2d7d80f0a..aa50268cb 100644
--- a/targets/app/common/Network/PlatformNetworkManagerStub.h
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.h
@@ -9,7 +9,7 @@
 #include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
-#include "platform/IPlatformNetwork.h"
+#include "app/common/Network/IPlatformNetwork.h"
 #include "minecraft/network/platform/SessionInfo.h"
 #include "platform/C4JThread.h"
 
diff --git a/targets/minecraft/BuildVer.h b/targets/minecraft/BuildVer.h
index 9215df6c7..130825af8 100644
--- a/targets/minecraft/BuildVer.h
+++ b/targets/minecraft/BuildVer.h
@@ -10,6 +10,11 @@
 #define VER_PRODUCTBUILD 560
 // This goes up if there is any change to network traffic or code in a build
 #define VER_NETWORK 560
+
+// Network protocol version. Sent in the pre-login packet so client and
+// server can detect mismatched builds.
+#define MINECRAFT_NET_VERSION VER_NETWORK
+
 #define VER_PRODUCTBUILD_QFE 0
 
 #define VER_FILEVERSION_STRING "1.6"
diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp
index 660490752..7b6334e5b 100644
--- a/targets/minecraft/network/packet/PreLoginPacket.cpp
+++ b/targets/minecraft/network/packet/PreLoginPacket.cpp
@@ -6,7 +6,6 @@
 #include <cstring>
 
 #include "minecraft/BuildVer.h"
-#include "platform/IPlatformNetwork.h"
 #include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp
index 732b591e5..0a27fa3a1 100644
--- a/targets/minecraft/server/network/PendingConnection.cpp
+++ b/targets/minecraft/server/network/PendingConnection.cpp
@@ -12,7 +12,6 @@
 #include "minecraft/GameEnums.h"
 #include "minecraft/BuildVer.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
-#include "platform/IPlatformNetwork.h"
 #include "platform/NetTypes.h"
 #include "PlayerConnection.h"
 #include "ServerConnection.h"
diff --git a/targets/platform/IPlatformSound.h b/targets/platform/IPlatformSound.h
deleted file mode 100644
index cb22aff11..000000000
--- a/targets/platform/IPlatformSound.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-
-class File;
-class Mob;
-class Options;
-
-class IPlatformSound {
-public:
-    virtual ~IPlatformSound() = default;
-
-    virtual void init(Options*) = 0;
-    virtual void destroy() = 0;
-    virtual void tick(std::shared_ptr<Mob>* players, float a) = 0;
-
-    // SFX
-    virtual void play(int iSound, float x, float y, float z, float volume,
-                      float pitch) = 0;
-    virtual void playUI(int iSound, float volume, float pitch) = 0;
-
-    // Streaming / music
-    virtual void playStreaming(const std::string& name, float x, float y,
-                               float z, float volume, float pitch,
-                               bool bMusicDelay = true) = 0;
-    virtual void playMusicTick() = 0;
-    virtual void updateMusicVolume(float fVal) = 0;
-    virtual void updateSystemMusicPlaying(bool isPlaying) = 0;
-    virtual void updateSoundEffectVolume(float fVal) = 0;
-
-    // Asset registration
-    virtual void add(const std::string& name, File* file) = 0;
-    virtual void addMusic(const std::string& name, File* file) = 0;
-    virtual void addStreaming(const std::string& name, File* file) = 0;
-    virtual char* ConvertSoundPathToName(const std::string& name,
-                                         bool bConvertSpaces = false) = 0;
-};