diff --git a/src/sdk/main/src/AccountId.cc b/src/sdk/main/src/AccountId.cc
index 3a09e755..14f6665e 100644
--- a/src/sdk/main/src/AccountId.cc
+++ b/src/sdk/main/src/AccountId.cc
@@ -1,4 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
+// Windows build requires this to be included first for some reason.
+#include <services/basic_types.pb.h> // NOLINT
+
 #include "AccountId.h"
 #include "Client.h"
 #include "LedgerId.h"
@@ -12,8 +15,6 @@
 #include "impl/MirrorNetwork.h"
 #include "impl/Utilities.h"
 
-#include <services/basic_types.pb.h>
-
 #include <nlohmann/json.hpp>
 
 #include <limits>
diff --git a/src/sdk/tests/unit/AccountBalanceUnitTests.cc b/src/sdk/tests/unit/AccountBalanceUnitTests.cc
index 0c3ae4ab..994f192d 100644
--- a/src/sdk/tests/unit/AccountBalanceUnitTests.cc
+++ b/src/sdk/tests/unit/AccountBalanceUnitTests.cc
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 #include "AccountBalance.h"
 
-#include <services/crypto_get_account_balance.pb.h>
 #include <gtest/gtest.h>
+#include <services/crypto_get_account_balance.pb.h>
 
 using namespace Hiero;