3 files changed, 5 insertions, 2 deletions
diff --git a/src/common/address.c b/src/common/address.c
index 5cd7a8df67..6799dd6c56 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1603,6 +1603,7 @@ get_interface_addresses_raw,(int severity, sa_family_t family))
     return result;
 #endif
   (void) severity;
+  (void) result;
   return NULL;
 }
 
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 8f1217e2bd..2d1155e205 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -13,6 +13,8 @@
 #ifndef TOR_CRYPTO_H
 #define TOR_CRYPTO_H
 
+#include "orconfig.h"
+
 #include <stdio.h>
 #include "torint.h"
 #include "testsupport.h"
diff --git a/src/common/util.c b/src/common/util.c
index 211ed7f8d2..259ff8756f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -4702,13 +4702,13 @@ tor_get_exit_code(process_handle_t *process_handle,
     return PROCESS_EXIT_RUNNING;
   } else if (retval != process_handle->pid) {
     log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s",
-             process_handle->pid, strerror(errno));
+             (int)process_handle->pid, strerror(errno));
     return PROCESS_EXIT_ERROR;
   }
 
   if (!WIFEXITED(stat_loc)) {
     log_warn(LD_GENERAL, "Process %d did not exit normally",
-             process_handle->pid);
+             (int)process_handle->pid);
     return PROCESS_EXIT_ERROR;
   }