diff --git a/aws/utils/backtrace/bsd_backtrace.cc b/aws/utils/backtrace/bsd_backtrace.cc
index fb5dbe36..cd6c5fee 100644
--- a/aws/utils/backtrace/bsd_backtrace.cc
+++ b/aws/utils/backtrace/bsd_backtrace.cc
@@ -15,10 +15,10 @@
 
 #include "backtrace.h"
 #include <aws/utils/writer_methods.h>
-#include <execinfo.h>
 #include <unistd.h>
 
 #ifdef BSD_BACKTRACE
+#include <execinfo.h>
 namespace aws {
 namespace utils {
 namespace backtrace {
diff --git a/aws/utils/backtrace/gcc_backtrace.cc b/aws/utils/backtrace/gcc_backtrace.cc
index 446ede93..32a866de 100644
--- a/aws/utils/backtrace/gcc_backtrace.cc
+++ b/aws/utils/backtrace/gcc_backtrace.cc
@@ -15,7 +15,6 @@
 
 #include "backtrace.h"
 #include <aws/utils/writer_methods.h>
-#include <execinfo.h>
 #include <unistd.h>
 #include <aws/utils/logging.h>
 #include <aws/utils/writer_methods.h>
@@ -23,7 +22,7 @@
 #include <cstdio>
 
 #ifdef LIB_BACKTRACE
-
+#include <execinfo.h>
 #include <backtrace.h>
 
 namespace {
diff --git a/aws/utils/backtrace/null_backtrace.cc b/aws/utils/backtrace/null_backtrace.cc
index 69d57f9c..368df577 100644
--- a/aws/utils/backtrace/null_backtrace.cc
+++ b/aws/utils/backtrace/null_backtrace.cc
@@ -15,10 +15,10 @@
 
 #include "backtrace.h"
 #include <aws/utils/writer_methods.h>
-#include <execinfo.h>
 #include <unistd.h>
 
-#ifdef NULL_STACKTRACE
+#ifdef NULL_BACKTRACE
+#include <execinfo.h>
 
 namespace aws {
 namespace utils {
@@ -36,4 +36,4 @@ void stack_trace_for_signal(int skip, bool /*signaled*/) {
 }
 }
 
-#endif // NULL_STACKTRACE
+#endif // NULL_BACKTRACE
diff --git a/aws/utils/signal_handler.cc b/aws/utils/signal_handler.cc
index b58ab0ea..f483c77a 100644
--- a/aws/utils/signal_handler.cc
+++ b/aws/utils/signal_handler.cc
@@ -19,7 +19,6 @@
 #include "backtrace/backtrace.h"
 
 #include <signal.h>
-#include <execinfo.h>
 #include <unistd.h>
 #include <cstring>
 #include <cstdint>
diff --git a/bootstrap.sh b/bootstrap.sh
index 894582de..397225c1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,6 +40,9 @@ function find_release_type() {
   if [[ $OSTYPE == "linux-gnu" ]]; then
     echo "linux-$(uname -m)"
     return
+  elif [[ $OSTYPE == "linux-musl" ]]; then
+    echo "linux-musl-$(uname -m)"
+    return
   elif [[ $OSTYPE == darwin* ]]; then
     echo "osx"
     return