diff --git a/Makefile.am b/Makefile.am
index 24bffc5e9e..0151ae25ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ endif
 
 if ISMAC
 SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-AM_CFLAGS += -DMACOSX -DBIGENDIAN
+AM_CFLAGS += -DMACOSX -DSWAP_LINEAR
 else
 SOLINK=-shared -Xlinker -x
 endif
diff --git a/Makefile.in b/Makefile.in
index 21d66a3e8f..8e36da7a87 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @ISLINUX_TRUE@am__append_1 = -Wl,-E
-@ISMAC_TRUE@am__append_2 = -DMACOSX -DBIGENDIAN
+@ISMAC_TRUE@am__append_2 = -DMACOSX -DSWAP_LINEAR
 bin_PROGRAMS = freeswitch$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
diff --git a/src/mod/mod_portaudio/mod_portaudio.c b/src/mod/mod_portaudio/mod_portaudio.c
index 1172ca9eb7..3084616823 100644
--- a/src/mod/mod_portaudio/mod_portaudio.c
+++ b/src/mod/mod_portaudio/mod_portaudio.c
@@ -296,7 +296,7 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
 {
 	if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
 		struct private_object *tech_pvt;
-		switch_channel *channel, *orig_channel;
+		switch_channel *channel;
 		switch_caller_profile *caller_profile;
 
 		if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
diff --git a/src/switch_event.c b/src/switch_event.c
index 49ad19212c..b581eae419 100644
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -343,7 +343,7 @@ SWITCH_DECLARE(switch_status) switch_event_add_header(switch_event *event, switc
 
 		header->name = DUP(header_name);
 		header->value = DUP(data);
-		if (stack = SWITCH_STACK_TOP) {
+		if ((stack = SWITCH_STACK_TOP)) {
 			header->next = event->headers;
 			event->headers = header;
 		} else {