diff --git a/include/NOD/Util.hpp b/include/NOD/Util.hpp
index cf50791..78fe45a 100644
--- a/include/NOD/Util.hpp
+++ b/include/NOD/Util.hpp
@@ -98,6 +98,9 @@ public:
 #endif
 #endif
 
+#undef bswap16
+#undef bswap32
+#undef bswap64
 /* Type-sensitive byte swappers */
 template <typename T>
 static inline T bswap16(T val)