diff --git a/stk.cpp b/stk.cpp
index 922fffa..3ad9a9f 100644
--- a/stk.cpp
+++ b/stk.cpp
@@ -151,4 +151,4 @@
 
 #ifdef __clang__
  #pragma pop // -Wtautological-compare
-#endif
\ No newline at end of file
+#endif
diff --git a/stk/Stk.h b/stk/Stk.h
index 17cfcb8..3b555ff 100644
--- a/stk/Stk.h
+++ b/stk/Stk.h
@@ -7,6 +7,15 @@
 #include <vector>
 #include <cstdlib>
 
+#if JUCE_ANDROID
+  #include <sys/endian.h>
+  // Stk.h defines stk::swap16/32/64.  This conflicts with macros in <sys/endian.h> on Android. Workaround: undefine them in the stk.h juce module header
+  #pragma message ("undefining swap16/32/64 macros to avoid conflict with stk header")
+  #undef swap16
+  #undef swap32
+  #undef swap64
+#endif
+
 /*! \namespace stk
     \brief The STK namespace.