diff --git a/src/Platform/Linux/System/Dispatcher.h b/src/Platform/Linux/System/Dispatcher.h
index 2b42a4a0b..cc163c676 100755
--- a/src/Platform/Linux/System/Dispatcher.h
+++ b/src/Platform/Linux/System/Dispatcher.h
@@ -93,7 +93,7 @@ class Dispatcher {
 # else
   static const int SIZEOF_PTHREAD_MUTEX_T = 32;
 # endif
-#elif __aarch64__
+#elif defined(__aarch64__)
   static const int SIZEOF_PTHREAD_MUTEX_T = 48;
 #else
   static const int SIZEOF_PTHREAD_MUTEX_T = 24;
diff --git a/src/Platform/Windows/System/TcpListener.h b/src/Platform/Windows/System/TcpListener.h
index aee36248b..47921f987 100755
--- a/src/Platform/Windows/System/TcpListener.h
+++ b/src/Platform/Windows/System/TcpListener.h
@@ -20,6 +20,7 @@
 
 #include <cstdint>
 #include <string>
+#include <stdexcept>
 
 namespace System {