diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc
index 7979c47bd63..8e9b6d32c58 100644
--- a/iocore/aio/Inline.cc
+++ b/iocore/aio/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_AIO.h"
-#endif
diff --git a/iocore/cache/Inline.cc b/iocore/cache/Inline.cc
index 6b9a4e2a056..ecd72d29e19 100644
--- a/iocore/cache/Inline.cc
+++ b/iocore/cache/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Cache.h"
-#endif
diff --git a/iocore/dns/Inline.cc b/iocore/dns/Inline.cc
index 0d065156a1c..27da8cd3665 100644
--- a/iocore/dns/Inline.cc
+++ b/iocore/dns/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_DNS.h"
-#endif
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index 432d14aa7be..dba98976971 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -110,7 +110,7 @@ class Thread
   */
   Ptr<ProxyMutex> mutex;
 
-  virtual void set_specific();
+  virtual void set_specific() = 0;
 
   static ink_thread_key thread_data_key;
 
diff --git a/iocore/eventsystem/Inline.cc b/iocore/eventsystem/Inline.cc
index 3c55a63096a..dc708c272ec 100644
--- a/iocore/eventsystem/Inline.cc
+++ b/iocore/eventsystem/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_EventSystem.h"
-#endif
diff --git a/iocore/eventsystem/Thread.cc b/iocore/eventsystem/Thread.cc
index a331c7afbf6..187a20a3e06 100644
--- a/iocore/eventsystem/Thread.cc
+++ b/iocore/eventsystem/Thread.cc
@@ -25,9 +25,8 @@
 
   Basic Threads
 
-
-
 **************************************************************************/
+
 #include "P_EventSystem.h"
 #include "tscore/ink_string.h"
 
diff --git a/iocore/eventsystem/unit_tests/test_IOBuffer.cc b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
index 0fc3518469e..1c2c407212c 100644
--- a/iocore/eventsystem/unit_tests/test_IOBuffer.cc
+++ b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
@@ -28,9 +28,6 @@
 
 #include "I_EventSystem.h"
 #include "RecordsConfig.h"
-#if defined(darwin)
-#include "P_IOBuffer.h"
-#endif
 
 #include "diags.i"
 
diff --git a/iocore/hostdb/Inline.cc b/iocore/hostdb/Inline.cc
index 3be8524fada..dd8fb467659 100644
--- a/iocore/hostdb/Inline.cc
+++ b/iocore/hostdb/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_HostDB.h"
-#endif
diff --git a/iocore/net/Inline.cc b/iocore/net/Inline.cc
index f54c7db7390..96716d64515 100644
--- a/iocore/net/Inline.cc
+++ b/iocore/net/Inline.cc
@@ -26,7 +26,5 @@
  *
  */
 
-#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Net.h"
-#endif
diff --git a/iocore/net/test_I_UDPNet.cc b/iocore/net/test_I_UDPNet.cc
index 39f6c113e1c..dca7e0ae92e 100644
--- a/iocore/net/test_I_UDPNet.cc
+++ b/iocore/net/test_I_UDPNet.cc
@@ -31,13 +31,8 @@
 #include "I_EventSystem.h"
 #include "I_Net.h"
 #include "I_UDPNet.h"
-#if defined(darwin)
-#include "P_UDPConnection.h"
-#include "P_UDPPacket.h"
-#else
 #include "I_UDPPacket.h"
 #include "I_UDPConnection.h"
-#endif
 
 #include "diags.i"