diff --git a/core/AES.hpp b/core/AES.hpp
index 99fb505f2..ba9e07497 100644
--- a/core/AES.hpp
+++ b/core/AES.hpp
@@ -27,6 +27,10 @@
 #define ZT_AES_NEON 1
 #endif
 
+#ifndef ZT_INLINE
+#define ZT_INLINE inline
+#endif
+
 namespace ZeroTier {
 
 /**
@@ -372,9 +376,8 @@ public:
 		 */
 		ZT_INLINE void finish1() noexcept
 		{
-			uint64_t tmp[2];
-
 			// Compute 128-bit GMAC tag.
+			uint64_t tmp[2];
 			_gmac.finish(reinterpret_cast<uint8_t *>(tmp));
 
 			// Shorten to 64 bits, concatenate with message IV, and encrypt with AES to
diff --git a/core/Protocol.hpp b/core/Protocol.hpp
index 0bb9008c7..b2f397025 100644
--- a/core/Protocol.hpp
+++ b/core/Protocol.hpp
@@ -183,11 +183,6 @@
  */
 #define ZT_PROTO_PACKET_FRAGMENT_INDICATOR 0xff
 
-/**
- * Length of a probe packet
- */
-#define ZT_PROTO_PROBE_LENGTH 4
-
 /**
  * Index at which packet fragment payload starts
  */