diff --git a/pipewire-alsa/alsa-plugins/pcm_pipewire.c b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
index 4ba25ee63..738de55f8 100644
--- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c
+++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
@@ -5,9 +5,6 @@
 #define __USE_GNU
 
 #include <limits.h>
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
-#include <byteswap.h>
-#endif
 #include <sys/shm.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -20,6 +17,7 @@
 #include <spa/debug/types.h>
 #include <spa/param/props.h>
 #include <spa/utils/atomic.h>
+#include <spa/utils/endian.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/spa/include/spa/param/audio/layout.h b/spa/include/spa/param/audio/layout.h
index 8b05ba03c..545ceae32 100644
--- a/spa/include/spa/param/audio/layout.h
+++ b/spa/include/spa/param/audio/layout.h
@@ -9,9 +9,7 @@
 extern "C" {
 #endif
 
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
-#include <endian.h>
-#endif
+#include <spa/utils/endian.h>
 
 /**
  * \addtogroup spa_param
diff --git a/spa/include/spa/param/audio/raw.h b/spa/include/spa/param/audio/raw.h
index a357d5597..8bed3f8a4 100644
--- a/spa/include/spa/param/audio/raw.h
+++ b/spa/include/spa/param/audio/raw.h
@@ -11,9 +11,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
-#include <endian.h>
-#endif
+#include <spa/utils/endian.h>
 
 /**
  * \addtogroup spa_param
diff --git a/spa/include/spa/utils/endian.h b/spa/include/spa/utils/endian.h
new file mode 100644
index 000000000..2d002d453
--- /dev/null
+++ b/spa/include/spa/utils/endian.h
@@ -0,0 +1,26 @@
+/* Spa */
+/* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
+/* SPDX-License-Identifier: MIT */
+
+#ifndef SPA_ENDIAN_H
+#define SPA_ENDIAN_H
+
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#elif defined(_MSC_VER) && defined(_WIN32)
+#include <stdlib.h>
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#define bswap_16 _byteswap_ushort
+#define bswap_32 _byteswap_ulong
+#define bswap_64 _byteswap_uint64
+#else
+#include <endian.h>
+#include <byteswap.h>
+#endif
+
+#endif /* SPA_ENDIAN_H */
diff --git a/spa/plugins/audioconvert/fmt-ops.h b/spa/plugins/audioconvert/fmt-ops.h
index 81434af0d..9f8b7e68b 100644
--- a/spa/plugins/audioconvert/fmt-ops.h
+++ b/spa/plugins/audioconvert/fmt-ops.h
@@ -3,16 +3,9 @@
 /* SPDX-License-Identifier: MIT */
 
 #include <math.h>
-#if defined(__FreeBSD__) || defined(__MidnightBSD__)
-#include <sys/endian.h>
-#define bswap_16 bswap16
-#define bswap_32 bswap32
-#define bswap_64 bswap64
-#else
-#include <byteswap.h>
-#endif
 
 #include <spa/utils/defs.h>
+#include <spa/utils/endian.h>
 #include <spa/utils/string.h>
 
 #define f32_round(a)	lrintf(a)
diff --git a/spa/plugins/bluez5/a2dp-codec-faststream.c b/spa/plugins/bluez5/a2dp-codec-faststream.c
index ce70e43f3..9e09d5560 100644
--- a/spa/plugins/bluez5/a2dp-codec-faststream.c
+++ b/spa/plugins/bluez5/a2dp-codec-faststream.c
@@ -7,12 +7,10 @@
 #include <stddef.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#if __BYTE_ORDER != __LITTLE_ENDIAN
-#include <byteswap.h>
-#endif
 
 #include <spa/param/audio/format.h>
 #include <spa/param/audio/format-utils.h>
+#include <spa/utils/endian.h>
 
 #include <sbc/sbc.h>
 
diff --git a/spa/plugins/bluez5/a2dp-codec-lc3plus.c b/spa/plugins/bluez5/a2dp-codec-lc3plus.c
index 98868899e..8f84becc4 100644
--- a/spa/plugins/bluez5/a2dp-codec-lc3plus.c
+++ b/spa/plugins/bluez5/a2dp-codec-lc3plus.c
@@ -7,12 +7,10 @@
 #include <stddef.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#if __BYTE_ORDER != __LITTLE_ENDIAN
-#include <byteswap.h>
-#endif
 
 #include <spa/param/audio/format.h>
 #include <spa/param/audio/format-utils.h>
+#include <spa/utils/endian.h>
 
 #ifdef HAVE_LC3PLUS_H
 #include <lc3plus.h>
diff --git a/spa/plugins/bluez5/a2dp-codec-opus-g.c b/spa/plugins/bluez5/a2dp-codec-opus-g.c
index df1ad7765..f3b3802b6 100644
--- a/spa/plugins/bluez5/a2dp-codec-opus-g.c
+++ b/spa/plugins/bluez5/a2dp-codec-opus-g.c
@@ -8,15 +8,13 @@
 #include <stddef.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#if __BYTE_ORDER != __LITTLE_ENDIAN
-#include <byteswap.h>
-#endif
 
 #include <spa/debug/types.h>
 #include <spa/param/audio/type-info.h>
 #include <spa/param/audio/raw.h>
 #include <spa/utils/string.h>
 #include <spa/utils/dict.h>
+#include <spa/utils/endian.h>
 #include <spa/param/audio/format.h>
 #include <spa/param/audio/format-utils.h>
 
diff --git a/spa/plugins/bluez5/a2dp-codec-opus.c b/spa/plugins/bluez5/a2dp-codec-opus.c
index 651d82d5b..92a1bf664 100644
--- a/spa/plugins/bluez5/a2dp-codec-opus.c
+++ b/spa/plugins/bluez5/a2dp-codec-opus.c
@@ -8,13 +8,11 @@
 #include <stddef.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#if __BYTE_ORDER != __LITTLE_ENDIAN
-#include <byteswap.h>
-#endif
 
 #include <spa/debug/types.h>
 #include <spa/param/audio/type-info.h>
 #include <spa/param/audio/raw.h>
+#include <spa/utils/endian.h>
 #include <spa/utils/string.h>
 #include <spa/utils/dict.h>
 #include <spa/param/audio/format.h>
diff --git a/src/modules/module-netjack2/peer.c b/src/modules/module-netjack2/peer.c
index 9417323a1..41559f451 100644
--- a/src/modules/module-netjack2/peer.c
+++ b/src/modules/module-netjack2/peer.c
@@ -1,5 +1,5 @@
 
-#include <byteswap.h>
+#include <spa/utils/endian.h>
 
 #ifdef HAVE_OPUS_CUSTOM
 #include <opus/opus.h>