diff --git a/src/sdk/main/include/ContractInfo.h b/src/sdk/main/include/ContractInfo.h
index 4aa5d836..49f83cee 100644
--- a/src/sdk/main/include/ContractInfo.h
+++ b/src/sdk/main/include/ContractInfo.h
@@ -34,6 +34,7 @@
 #include <memory>
 #include <optional>
 #include <string>
+#include <unordered_map>
 
 namespace proto
 {
diff --git a/src/sdk/main/src/AccountBalanceQuery.cc b/src/sdk/main/src/AccountBalanceQuery.cc
index dc38edc7..e11a4f15 100644
--- a/src/sdk/main/src/AccountBalanceQuery.cc
+++ b/src/sdk/main/src/AccountBalanceQuery.cc
@@ -17,14 +17,15 @@
  * limitations under the License.
  *
  */
-#include "AccountBalanceQuery.h"
+#include <proto/crypto_get_account_balance.pb.h>
+
 #include "AccountBalance.h"
+#include "AccountBalanceQuery.h"
 #include "TokenId.h"
 #include "exceptions/UninitializedException.h"
 #include "impl/MirrorNodeGateway.h"
 #include "impl/Node.h"
 
-#include <proto/crypto_get_account_balance.pb.h>
 #include <proto/query.pb.h>
 #include <proto/query_header.pb.h>
 #include <proto/response.pb.h>
diff --git a/src/sdk/main/src/AccountInfoQuery.cc b/src/sdk/main/src/AccountInfoQuery.cc
index 3cb17417..3729a036 100644
--- a/src/sdk/main/src/AccountInfoQuery.cc
+++ b/src/sdk/main/src/AccountInfoQuery.cc
@@ -17,14 +17,15 @@
  * limitations under the License.
  *
  */
-#include "AccountInfoQuery.h"
+#include <proto/crypto_get_info.pb.h>
+
 #include "AccountInfo.h"
+#include "AccountInfoQuery.h"
 #include "TokenId.h"
 #include "TokenRelationship.h"
 #include "impl/MirrorNodeGateway.h"
 #include "impl/Node.h"
 
-#include <proto/crypto_get_info.pb.h>
 #include <proto/query.pb.h>
 #include <proto/query_header.pb.h>
 #include <proto/response.pb.h>
diff --git a/src/sdk/main/src/ContractInfoQuery.cc b/src/sdk/main/src/ContractInfoQuery.cc
index 735ede2b..c8266cdf 100644
--- a/src/sdk/main/src/ContractInfoQuery.cc
+++ b/src/sdk/main/src/ContractInfoQuery.cc
@@ -17,12 +17,13 @@
  * limitations under the License.
  *
  */
-#include "ContractInfoQuery.h"
+#include <proto/contract_get_info.pb.h>
+
 #include "ContractInfo.h"
+#include "ContractInfoQuery.h"
 #include "impl/MirrorNodeGateway.h"
 #include "impl/Node.h"
 
-#include <proto/contract_get_info.pb.h>
 #include <proto/query.pb.h>
 #include <proto/query_header.pb.h>
 #include <proto/response.pb.h>