diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 6312bcc693..bf139e0b9a 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -26,7 +26,11 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <sys/time.h>
+#ifdef __linux__
 #include <linux/soundcard.h>
+#else
+#include <soundcard.h>
+#endif
 #include <netinet/in.h>
 
 #define DEV_DSP "/dev/dsp"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 9f942e272c..ffbbbdef8c 100755
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -33,7 +33,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef __linux
 #include <linux/soundcard.h>
+#else
+#include <soundcard.h>
+#endif
 #include "busy.h"
 #include "ringtone.h"
 #include "ring10.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 5d4aeab4ac..ee6f6ab508 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 /* Some Ideas for this code came from makeg729e.c by Jeffery Chilton */
 
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 87bd91bc44..5f7b74b00f 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 /* Some Ideas for this code came from makegsme.c by Jeffery Chilton */
 
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index 2d9b3e4731..7e646f8948 100755
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -26,8 +26,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
-
+#else
+#include <machine/endian.h>
+#endif
 
 
 static char *desc = "JPEG (Joint Picture Experts Group) Image Format";
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 28daed68fa..14931dfdf3 100755
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 #define BUF_SIZE 160		/* 160 samples */
 
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index 129e292b3e..9a4f665866 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -27,7 +27,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 #define BUF_SIZE 160		/* 160 samples */
 
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 0a4c7c025f..3848f47c05 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 #define BUF_SIZE 80		/* 160 samples */
 
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 876714ad79..2dc5471196 100755
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 
 /* Some Ideas for this code came from makewave.c by Jeffery Chilton */
 
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 527a4014a5..fc6323b670 100755
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -25,7 +25,11 @@
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 #include "msgsm.h"
 
 /* Some Ideas for this code came from makewave.c by Jeffery Chilton */
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index c23ed71cec..e89891bb1c 100755
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -20,7 +20,11 @@
 extern "C" {
 #endif
 
+#ifdef __linux__
 #include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
 #include <sys/types.h>
 
 //! Data structure associated with a single frame of data