diff --git a/configure.in b/configure.in
index 4cd0cf0a7e..c27f9b4e5d 100644
--- a/configure.in
+++ b/configure.in
@@ -190,7 +190,7 @@ AC_SUBST(DYNAMIC_LIB_EXTEN)
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h])
+AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h netdb.h execinfo.h])
 
 # for xmlrpc-c config.h
 if test x"$ac_cv_header_wchar_h" = xyes; then
diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 7ab813a1a0..c55ff05951 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -60,6 +60,10 @@ typedef apr_os_thread_t switch_thread_id_t;
 #include <sys/mman.h>
 #endif
 
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
 #ifndef WIN32
 /* setuid, setgid */
 #include <unistd.h>
diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 4e195dc829..c7d6089ecf 100644
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -198,7 +198,7 @@ static void switch_core_standard_on_hibernate(switch_core_session_t *session)
 //static switch_hash_t *stack_table = NULL;
 static Hash stack_table;
 
-#if defined (__GNUC__) && defined (LINUX)
+#if defined (__GNUC__) && defined (LINUX) && defined (HAVE_EXECINFO_H)
 #include <execinfo.h>
 #include <stdio.h>
 #include <stdlib.h>