diff --git a/core/OS.hpp b/core/OS.hpp
index a00743916..f4e83da78 100644
--- a/core/OS.hpp
+++ b/core/OS.hpp
@@ -115,8 +115,10 @@
 #include <mmintrin.h>
 #endif
 
-#if (defined(__ARM_NEON) || defined(__ARM_NEON__))
+#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
+#ifndef ZT_ARCH_ARM_HAS_NEON
 #define ZT_ARCH_ARM_HAS_NEON 1
+#endif
 #include <arm_neon.h>
 /*#include <arm_acle.h>*/
 #endif
diff --git a/osdep/MacEthernetTap.cpp b/osdep/MacEthernetTap.cpp
index 9cdfbec45..b1d16fbf6 100644
--- a/osdep/MacEthernetTap.cpp
+++ b/osdep/MacEthernetTap.cpp
@@ -22,9 +22,6 @@
 #include "MacEthernetTap.hpp"
 #include "MacEthernetTapAgent.h"
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>