diff --git a/src/common/address.c b/src/common/address.c
index 27f8c4efe2..f9e5cc5c74 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -42,6 +42,7 @@
 #include "common/torlog.h"
 #include "lib/container/container.h"
 #include "common/sandbox.h"
+#include "siphash.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -2169,4 +2170,3 @@ tor_addr_port_eq(const tor_addr_port_t *a,
 {
   return tor_addr_eq(&a->addr, &b->addr) && a->port == b->port;
 }
-
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index e67cedf0b7..7e88ec9dd1 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "common/sandbox.h"
-#include "lib/container/container.h"
+#include "lib/container/map.h"
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "lib/cc/torint.h"
@@ -42,6 +42,8 @@
 
 #include "ht.h"
 
+#include "siphash.h"
+
 #define DEBUGGING_CLOSE
 
 #if defined(USE_LIBSECCOMP)
diff --git a/src/lib/container/container.h b/src/lib/container/container.h
index 1d0a477492..6912ae31ea 100644
--- a/src/lib/container/container.h
+++ b/src/lib/container/container.h
@@ -7,6 +7,5 @@
 #define TOR_CONTAINER_H
 
 #include "lib/container/smartlist.h"
-#include "lib/container/map.h"
 
 #endif /* !defined(TOR_CONTAINER_H) */
diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include
index 4f415f876e..94275c1d9e 100644
--- a/src/lib/crypt_ops/.may_include
+++ b/src/lib/crypt_ops/.may_include
@@ -11,5 +11,7 @@ trunnel/pwbox.h
 keccak-tiny/*.h
 ed25519/*.h
 
+siphash.h
+
 # XXX I'd like to remove this.
 common/*.h
diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index de7e271d39..9b1c38041f 100644
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -73,6 +73,8 @@ ENABLE_GCC_WARNING(redundant-decls)
 
 #include "keccak-tiny/keccak-tiny.h"
 
+#include "siphash.h"
+
 /** Boolean: has OpenSSL's crypto been initialized? */
 static int crypto_early_initialized_ = 0;
 
diff --git a/src/or/or.h b/src/or/or.h
index c701239345..5c2a6d300d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -69,7 +69,8 @@
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/tls/tortls.h"
 #include "common/torlog.h"
-#include "lib/container/container.h"
+#include "lib/container/smartlist.h"
+#include "lib/container/map.h"
 #include "lib/compress/compress.h"
 #include "common/address.h"
 #include "common/compat_libevent.h"