diff --git a/libs/libsndfile/Makefile.am b/libs/libsndfile/Makefile.am
index bae93e10d4..e59ce36e90 100644
--- a/libs/libsndfile/Makefile.am
+++ b/libs/libsndfile/Makefile.am
@@ -1,10 +1,11 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
 
-SUBDIRS = man doc Win32 Octave src examples regtest tests
+SUBDIRS = Win32 Octave src
+# man doc Win32 examples regtest tests
 DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
 			sndfile.pc.in Mingw-make-dist.sh
-			
+
 			 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = sndfile.pc
diff --git a/src/include/switch.h b/src/include/switch.h
index a7cef117f3..84019a77e5 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -50,8 +50,7 @@
 #define FREESWITCH_PEN "27880"
 #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN
 #define FREESWITCH_ITAD "543"
-
-
+#define __EXTENSIONS__ 1
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -60,7 +59,7 @@
 #include <setjmp.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include <sys/types.h>
diff --git a/src/switch_apr.c b/src/switch_apr.c
index de82ab8e5e..7a25a9a327 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -381,7 +381,7 @@ SWITCH_DECLARE(switch_status_t) switch_socket_create(switch_socket_t ** new_sock
 
 SWITCH_DECLARE(switch_status_t) switch_socket_shutdown(switch_socket_t * sock, switch_shutdown_how_e how)
 {
-	return apr_socket_shutdown(sock, how);
+	return apr_socket_shutdown(sock, (apr_shutdown_how_e)how);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_socket_close(switch_socket_t * sock)
diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 47279353b9..6c7bf5b348 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -31,7 +31,6 @@
 #include <switch.h>
 
 static const switch_state_handler_table_t audio_bridge_peer_state_handlers;
-static const switch_state_handler_table_t originate_state_handlers;
 
 /* Bridge Related Stuff*/
 /*********************************************************************************/
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index ba7eb3cc3a..5d708b2380 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -77,7 +77,7 @@ static switch_say_method_t get_say_method_by_name(char *name)
 	return (switch_say_method_t) x;
 }
 
-static switch_say_method_t get_say_type_by_name(char *name)
+static switch_say_type_t get_say_type_by_name(char *name)
 {
 	int x = 0;
 	for (x = 0; SAY_TYPE_NAMES[x]; x++) {
@@ -86,7 +86,7 @@ static switch_say_method_t get_say_type_by_name(char *name)
 		}
 	}
 
-	return (switch_say_method_t) x;
+	return (switch_say_type_t) x;
 }