diff --git a/src/Filecoin/Address.cpp b/src/Filecoin/Address.cpp
index 07dc7d7577c..cae8b677bdb 100644
--- a/src/Filecoin/Address.cpp
+++ b/src/Filecoin/Address.cpp
@@ -4,6 +4,7 @@
 
 #include "Address.h"
 
+#include <algorithm>
 #include <climits>
 
 #include "../Base32.h"
diff --git a/src/Groestlcoin/Address.cpp b/src/Groestlcoin/Address.cpp
index 7871353d279..74253e2799b 100644
--- a/src/Groestlcoin/Address.cpp
+++ b/src/Groestlcoin/Address.cpp
@@ -3,8 +3,9 @@
 // Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
+#include "Base58.h"
 
-#include "../Base58.h"
+#include <algorithm>
 #include <TrezorCrypto/ecdsa.h>
 
 namespace TW::Groestlcoin {
diff --git a/src/NEO/Transaction.cpp b/src/NEO/Transaction.cpp
index 933dc97df50..0c8d7431da8 100644
--- a/src/NEO/Transaction.cpp
+++ b/src/NEO/Transaction.cpp
@@ -46,7 +46,6 @@ Transaction* Transaction::deserializeFrom(const Data& data, size_t initial_pos)
         break;
     default:
         throw std::invalid_argument("Transaction::deserializeFrom Invalid transaction type");
-        break;
     }
     resp->deserialize(data, initial_pos);
     return resp;
diff --git a/src/Nano/Signer.cpp b/src/Nano/Signer.cpp
index bfac78f141d..1dc1deeb228 100644
--- a/src/Nano/Signer.cpp
+++ b/src/Nano/Signer.cpp
@@ -7,8 +7,9 @@
 #include "../BinaryCoding.h"
 #include "../HexCoding.h"
 #include "../uint256.h"
-#include <nlohmann/json.hpp>
 
+#include <algorithm>
+#include <nlohmann/json.hpp>
 #include <google/protobuf/util/json_util.h>
 
 using namespace TW;
diff --git a/src/interface/TWCardano.cpp b/src/interface/TWCardano.cpp
index 798f8392452..d4278c593c9 100644
--- a/src/interface/TWCardano.cpp
+++ b/src/interface/TWCardano.cpp
@@ -2,6 +2,7 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+#include <algorithm>
 #include <TrustWalletCore/TWCardano.h>
 
 #include "Cardano/Transaction.h"