diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp
deleted file mode 100644
index 70eb121d..00000000
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-/*************************************************************
-*
-*   This file was auto-generated by plDhKeyGen.exe
-*
-***/
-
-static const unsigned kDhGValue = 41;
-
-static const byte kDhNData[] = {
-    0x2d, 0x17, 0x19, 0x42, 0xeb, 0x71, 0x8f, 0x91, 
-    0x29, 0x7c, 0x61, 0x88, 0x43, 0x75, 0xe5, 0xee, 
-    0x72, 0xfe, 0x45, 0x1b, 0x43, 0xc3, 0x8e, 0xb9, 
-    0x47, 0x5e, 0x03, 0xc8, 0x0c, 0x78, 0xb7, 0xe4, 
-    0x4d, 0x31, 0x5b, 0xcb, 0x66, 0xc2, 0x54, 0x1a, 
-    0x0a, 0x61, 0x11, 0x57, 0x38, 0x66, 0x9b, 0x34, 
-    0x6b, 0xab, 0x6d, 0x12, 0x12, 0x38, 0x87, 0xc5, 
-    0x3f, 0x20, 0xbe, 0x97, 0xa3, 0xa6, 0x56, 0x8f
-};
-COMPILER_ASSERT(sizeof(kDhNData) == kNetDiffieHellmanKeyBits / 8);
-
-static const byte kDhXData[] = {
-    0x21, 0xcf, 0x1d, 0xc6, 0x08, 0xc0, 0x23, 0xad, 
-    0x53, 0x36, 0xce, 0x61, 0x25, 0xdd, 0xb9, 0x55, 
-    0x05, 0xc1, 0xbb, 0x8f, 0xf4, 0x0d, 0x59, 0xf9, 
-    0x20, 0x27, 0x9a, 0xee, 0xfb, 0x23, 0x5b, 0xeb, 
-    0xe5, 0xec, 0x01, 0x55, 0x2e, 0xd5, 0x64, 0xef, 
-    0xea, 0x43, 0xb1, 0x9e, 0xb9, 0x8c, 0x75, 0x3f, 
-    0xda, 0xb2, 0xbb, 0xb3, 0x6a, 0x3d, 0xcd, 0xbc, 
-    0xfa, 0x6f, 0x03, 0xf3, 0x55, 0xd8, 0xe9, 0x1b
-};
-COMPILER_ASSERT(sizeof(kDhXData) == kNetDiffieHellmanKeyBits / 8);
-
-
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbCsrKey.hpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbCsrKey.hpp
deleted file mode 100644
index 7c64fe7e..00000000
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbCsrKey.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-/*************************************************************
-*
-*   This file was auto-generated by plDhKeyGen.exe
-*
-***/
-
-static const unsigned kDhGValue = 97;
-
-static const byte kDhNData[] = {
-    0xbd, 0xf8, 0x03, 0x17, 0xed, 0x27, 0x74, 0x0d, 
-    0x76, 0x8e, 0x7a, 0x8c, 0x88, 0xeb, 0xec, 0xde, 
-    0xd7, 0x73, 0x37, 0x8f, 0x4b, 0xbc, 0xae, 0x75, 
-    0xf8, 0xda, 0x22, 0xee, 0x50, 0xc9, 0xb3, 0x69, 
-    0x97, 0x0b, 0xe5, 0x28, 0x98, 0x91, 0xf7, 0x44, 
-    0x97, 0xdf, 0x70, 0xf1, 0x86, 0x6c, 0xfa, 0x03, 
-    0x7c, 0x47, 0x73, 0xb1, 0x62, 0x00, 0x42, 0x99, 
-    0xf0, 0xc6, 0xe7, 0x05, 0xd8, 0xcd, 0xd6, 0x6d
-};
-COMPILER_ASSERT(sizeof(kDhNData) == kNetDiffieHellmanKeyBits / 8);
-
-static const byte kDhXData[] = {
-    0x03, 0x1d, 0x83, 0x62, 0x36, 0x92, 0x63, 0xa6, 
-    0xa8, 0x66, 0x31, 0xbe, 0x28, 0x42, 0xc2, 0xe6, 
-    0x86, 0x98, 0x3a, 0x81, 0x13, 0x0e, 0xb7, 0x96, 
-    0x5e, 0x27, 0x87, 0x6a, 0x06, 0x68, 0x51, 0x21, 
-    0xf3, 0x74, 0xe9, 0x11, 0xe9, 0x73, 0x5f, 0xdb, 
-    0x37, 0x2a, 0x2d, 0x49, 0xa4, 0x76, 0x12, 0x06, 
-    0x58, 0x36, 0x59, 0x6d, 0xbb, 0x59, 0x57, 0x2c, 
-    0x34, 0xe4, 0x5e, 0xd4, 0x2c, 0x78, 0xc3, 0x34
-};
-COMPILER_ASSERT(sizeof(kDhXData) == kNetDiffieHellmanKeyBits / 8);
-
-
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp
deleted file mode 100644
index 37d81eb1..00000000
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-/*************************************************************
-*
-*   This file was auto-generated by plDhKeyGen.exe
-*
-***/
-
-static const unsigned kDhGValue = 73;
-
-static const byte kDhNData[] = {
-    0x38, 0xa4, 0xf7, 0x69, 0x43, 0xd7, 0xa6, 0xc7, 
-    0x27, 0x72, 0x3b, 0x12, 0x6a, 0x76, 0x09, 0x5d, 
-    0xaa, 0x9a, 0x38, 0x44, 0xde, 0x84, 0x22, 0xc4, 
-    0xde, 0x3f, 0xfd, 0x50, 0x26, 0xea, 0xbb, 0x20, 
-    0xd6, 0xad, 0x2e, 0xcd, 0xfe, 0xf2, 0x70, 0x1b, 
-    0x19, 0xd1, 0x82, 0x15, 0xd7, 0xcb, 0x33, 0x60, 
-    0x20, 0xbc, 0x43, 0xc9, 0x55, 0x0b, 0xc9, 0x20, 
-    0xd9, 0x24, 0xd2, 0x49, 0xd0, 0x28, 0x4b, 0x90
-};
-COMPILER_ASSERT(sizeof(kDhNData) == kNetDiffieHellmanKeyBits / 8);
-
-static const byte kDhXData[] = {
-    0xf9, 0xb2, 0x93, 0xbd, 0x02, 0xbd, 0x72, 0x48, 
-    0xa9, 0x21, 0xbd, 0x09, 0x3e, 0x44, 0x65, 0x3e, 
-    0xc2, 0xfd, 0x5a, 0xf0, 0x99, 0x3b, 0x3f, 0x5c, 
-    0x47, 0x76, 0x5c, 0x1f, 0x84, 0xd8, 0x01, 0x68, 
-    0xdc, 0x5f, 0xb6, 0xba, 0xc8, 0xfd, 0x79, 0x98, 
-    0x62, 0x93, 0x36, 0x7f, 0x14, 0xcf, 0x33, 0x67, 
-    0x84, 0x04, 0xcf, 0xa3, 0x7a, 0x65, 0xe9, 0x68, 
-    0x4f, 0x58, 0x58, 0xb3, 0x8f, 0x3d, 0xdb, 0x3d
-};
-COMPILER_ASSERT(sizeof(kDhXData) == kNetDiffieHellmanKeyBits / 8);
-
-
diff --git a/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp b/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp
deleted file mode 100644
index 993f14c6..00000000
--- a/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-/*****************************************************************************
-*
-*   This file auto-generated by plDhKeyGen.exe
-*   
-***/
-
-static const unsigned kDhGValue = 4;
-
-static const byte kDhNData[] = {
-    0x8d, 0xfa, 0x35, 0xe6, 0xf8, 0x7a, 0x50, 0x50, 
-    0xab, 0x25, 0x4b, 0x81, 0xd1, 0xd7, 0x7a, 0x23, 
-    0xa3, 0x9a, 0x21, 0x0f, 0x34, 0xab, 0x66, 0x2e, 
-    0x16, 0x98, 0x55, 0xb6, 0xfc, 0x49, 0xd5, 0x50, 
-    0xdc, 0xb8, 0x4c, 0x4d, 0xc7, 0xdb, 0xf1, 0x1c, 
-    0x15, 0x4c, 0x55, 0xf5, 0x92, 0x0d, 0x6a, 0xec, 
-    0x60, 0xbc, 0x55, 0xfa, 0x29, 0x2f, 0x6f, 0xc3, 
-    0xd7, 0x21, 0x80, 0xa3, 0x6b, 0x44, 0x23, 0xb5, 
-};
-COMPILER_ASSERT(sizeof(kDhNData) == kNetDiffieHellmanKeyBits / 8);
-
-static const byte kDhXData[] = {
-    0xb3, 0x88, 0xff, 0x0b, 0x90, 0x70, 0x2b, 0x2e, 
-    0x07, 0xbc, 0x62, 0x98, 0x83, 0x9d, 0x0f, 0x05, 
-    0x39, 0xfa, 0x35, 0x39, 0xa9, 0xf3, 0xb3, 0xfc, 
-    0xcd, 0x5e, 0xa9, 0xa6, 0x61, 0x0f, 0x9b, 0x38, 
-    0x0f, 0x9c, 0xbe, 0xa0, 0xbe, 0x6f, 0x7f, 0xe4, 
-    0x7c, 0xcb, 0xc4, 0x09, 0x6c, 0x8d, 0xce, 0x47, 
-    0x68, 0x82, 0x32, 0xc5, 0x89, 0x94, 0xf9, 0xca, 
-    0x69, 0x69, 0xd0, 0x60, 0x19, 0xb7, 0xf3, 0x1a, 
-};
-COMPILER_ASSERT(sizeof(kDhXData) == kNetDiffieHellmanKeyBits / 8);
-
diff --git a/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp b/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
index 9704aeaa..73c9ba24 100644
--- a/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
@@ -32,11 +32,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "Pch.h"
 #pragma hdrstop
 
-namespace AuthKey {
-// This file excluded from pre-compiled header because it is auto-generated by the build server.
-#include "pnNetBase/pnNbAuthKey.hpp"
-} // AuthKey
-
 /*****************************************************************************
 *
 *   Local types
@@ -604,9 +599,9 @@ static void StartAuthTcpTest (
             false,
             s_send, arrsize(s_send),
             s_recv, arrsize(s_recv),
-            AuthKey::kDhGValue,
-            BigNum(sizeof(AuthKey::kDhXData), AuthKey::kDhXData),
-            BigNum(sizeof(AuthKey::kDhNData), AuthKey::kDhNData)
+            kAuthDhGValue,
+            BigNum(sizeof(kAuthDhXData), kAuthDhXData),
+            BigNum(sizeof(kAuthDhNData), kAuthDhNData)
         );
     }
 
diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
index 07a67201..b6f67e43 100644
--- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
@@ -32,9 +32,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../Pch.h"
 #pragma hdrstop
 
-// This file excluded from pre-compiled header because it is auto-generated by the build server.
-#include "pnNetBase/pnNbAuthKey.hpp"
-
 namespace Ngl { namespace Auth {
 /*****************************************************************************
 *
@@ -5028,9 +5025,9 @@ void AuthInitialize () {
         false,
         s_send, arrsize(s_send),
         s_recv, arrsize(s_recv),
-        kDhGValue,
-        BigNum(sizeof(kDhXData), kDhXData),
-        BigNum(sizeof(kDhNData), kDhNData)
+        kAuthDhGValue,
+        BigNum(sizeof(kAuthDhXData), kAuthDhXData),
+        BigNum(sizeof(kAuthDhNData), kAuthDhNData)
     );
 }
 
diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp
index 7efb4880..266a2996 100644
--- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp
@@ -32,9 +32,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../Pch.h"
 #pragma hdrstop
 
-// This file excluded from pre-compiled header because it is auto-generated by the build server.
-#include "pnNetBase/pnNbCsrKey.hpp"
-
 
 namespace Ngl { namespace Csr {
 /*****************************************************************************
@@ -742,9 +739,9 @@ void CsrInitialize () {
         false,
         s_send, arrsize(s_send),
         s_recv, arrsize(s_recv),
-        kDhGValue,
-        BigNum(sizeof(kDhXData), kDhXData),
-        BigNum(sizeof(kDhNData), kDhNData)
+        kCsrDhGValue,
+        BigNum(sizeof(kCsrDhXData), kCsrDhXData),
+        BigNum(sizeof(kCsrDhNData), kCsrDhNData)
     );
 }
 
diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
index f083d9c1..69382528 100644
--- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
@@ -32,9 +32,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../Pch.h"
 #pragma hdrstop
 
-// This file excluded from pre-compiled header because it is auto-generated by the build server.
-#include "pnNetBase/pnNbGameKey.hpp"
-
 namespace Ngl { namespace Game {
 /*****************************************************************************
 *
@@ -635,9 +632,9 @@ void GameInitialize () {
         false,
         s_send, arrsize(s_send),
         s_recv, arrsize(s_recv),
-        kDhGValue,
-        BigNum(sizeof(kDhXData), kDhXData),
-        BigNum(sizeof(kDhNData), kDhNData)
+        kGameDhGValue,
+        BigNum(sizeof(kGameDhXData), kGameDhXData),
+        BigNum(sizeof(kGameDhNData), kGameDhNData)
     );
 }
 
diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
index 43d489f7..92c7af4b 100644
--- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
@@ -32,9 +32,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../Pch.h"
 #pragma hdrstop
 
-// This file excluded from pre-compiled header because it is auto-generated by the build server.
-#include "pnNetBase/pnNbGateKeeperKey.hpp"
-
 namespace Ngl { namespace GateKeeper {
 
 /*****************************************************************************
@@ -981,9 +978,9 @@ void GateKeeperInitialize () {
         false,
         s_send, arrsize(s_send),
         s_recv, arrsize(s_recv),
-        kDhGValue,
-        BigNum(sizeof(kDhXData), kDhXData),
-        BigNum(sizeof(kDhNData), kDhNData)
+        kGateKeeperDhGValue,
+        BigNum(sizeof(kGateKeeperDhXData), kGateKeeperDhXData),
+        BigNum(sizeof(kGateKeeperDhNData), kGateKeeperDhNData)
     );
 }