diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac
index ca6bd3a82e..9542208cb6 100644
--- a/libs/sofia-sip/configure.ac
+++ b/libs/sofia-sip/configure.ac
@@ -218,7 +218,7 @@ fi
 AC_C_CONST
 AC_C_INLINE
 AC_C_INLINE_DEFINE
-AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
+AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
 
 AC_C_VAR_FUNC
 AC_C_MACRO_FUNCTION
diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 4040c0f6ab..b93be26964 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -6,6 +6,10 @@
 #include <fcntl.h>
 #endif
 
+#if defined(__linux__) || defined(__GLIBC__)
+#include <byteswap.h>
+#endif
+
 #ifndef _MSC_VER
 #define ms_sleep(x)	usleep( x * 1000);
 #else
diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c
index 34566b15d8..bc005f76e0 100644
--- a/src/mod/applications/mod_avmd/mod_avmd.c
+++ b/src/mod/applications/mod_avmd/mod_avmd.c
@@ -44,6 +44,7 @@
     #define ISINF(x) (isinf(x))
 #else
     int __isnan(double);
+	int __isinf(double);
     #define ISNAN(x) (__isnan(x))
     #define ISINF(x) (__isinf(x))
 #endif
diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index 4040c0f6ab..b93be26964 100644
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -6,6 +6,10 @@
 #include <fcntl.h>
 #endif
 
+#if defined(__linux__) || defined(__GLIBC__)
+#include <byteswap.h>
+#endif
+
 #ifndef _MSC_VER
 #define ms_sleep(x)	usleep( x * 1000);
 #else