diff --git a/AirLib/include/api/RpcLibClientBase.hpp b/AirLib/include/api/RpcLibClientBase.hpp
index c966289529..1ff667cc63 100644
--- a/AirLib/include/api/RpcLibClientBase.hpp
+++ b/AirLib/include/api/RpcLibClientBase.hpp
@@ -16,11 +16,6 @@
 #include "physics/Environment.hpp"
 #include "api/WorldSimApiBase.hpp"
 
-#include "api/RpcLibPort.hpp"
-
-const extern uint16_t RpcLibPort;
-
-
 namespace msr { namespace airlib {
 
 //common methods for RCP clients of different vehicles
diff --git a/AirLib/include/api/RpcLibPort.hpp b/AirLib/include/api/RpcLibPort.hpp
deleted file mode 100644
index 7e1ef396cc..0000000000
--- a/AirLib/include/api/RpcLibPort.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#ifndef air_RpcLibPort_hpp
-#define air_RpcLibPort_hpp
-
-#include "common/Common.hpp"
-
-const uint16_t RpcLibPort = 41451;
-
-#endif
diff --git a/AirLib/include/common/Common.hpp b/AirLib/include/common/Common.hpp
index 62c72b9576..8ac10fcbff 100644
--- a/AirLib/include/common/Common.hpp
+++ b/AirLib/include/common/Common.hpp
@@ -19,6 +19,8 @@
 #define _CRT_SECURE_NO_WARNINGS 1
 #endif
 
+#define RpcLibPort 41451
+
 namespace msr { namespace airlib {
 
 //numericals