Expunge container.h

15 files changed, 1 insertions, 23 deletions

diff --git a/src/common/address.h b/src/common/address.h
index 87f29fc281..8abff072c0 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -15,7 +15,6 @@
 #include "orconfig.h"
 #include "lib/cc/torint.h"
 #include "common/compat.h"
-#include "lib/container/container.h"
 #include "common/util_bug.h"
 
 #ifdef ADDRESS_PRIVATE
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 032c4e43a1..4bb64f1e8f 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -37,7 +37,6 @@
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/util.h"
-#include "lib/container/container.h"
 
 #ifndef HAVE_GETTIMEOFDAY
 #ifdef HAVE_FTIME
diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index eeb0b97510..807c7b4ae3 100644
--- a/src/common/compat_winthreads.c
+++ b/src/common/compat_winthreads.c
@@ -16,7 +16,6 @@
 #include <windows.h>
 #include <process.h>
 #include "common/util.h"
-#include "lib/container/container.h"
 #include "common/torlog.h"
 
 /* This value is more or less total cargo-cult */
diff --git a/src/common/memarea.c b/src/common/memarea.c
index ef6b78ecc5..ec10f02220 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -13,7 +13,6 @@
 #include "common/util.h"
 #include "common/compat.h"
 #include "common/torlog.h"
-#include "lib/container/container.h"
 
 #ifndef DISABLE_MEMORY_SENTINELS
 
diff --git a/src/lib/container/container.h b/src/lib/container/container.h
deleted file mode 100644
index 3dc70e6353..0000000000
--- a/src/lib/container/container.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2003-2004, Roger Dingledine
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2018, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#ifndef TOR_CONTAINER_H
-#define TOR_CONTAINER_H
-
-#endif /* !defined(TOR_CONTAINER_H) */
diff --git a/src/lib/container/include.am b/src/lib/container/include.am
index e2994674ad..0e7acdff97 100644
--- a/src/lib/container/include.am
+++ b/src/lib/container/include.am
@@ -19,7 +19,6 @@ src_lib_libtor_container_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 noinst_HEADERS +=					\
 	src/lib/container/bitarray.h			\
 	src/lib/container/bloomfilt.h			\
-	src/lib/container/container.h			\
 	src/lib/container/map.h				\
 	src/lib/container/order.h			\
 	src/lib/container/smartlist.h
diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index 508680e4a5..f6b0f73c17 100644
--- a/src/lib/container/map.c
+++ b/src/lib/container/map.c
@@ -158,7 +158,7 @@ digest256map_assign_key(digest256map_entry_t *ent, const uint8_t *key)
 
 /**
  * Macro: implement all the functions for a map that are declared in
- * container.h by the DECLARE_MAP_FNS() macro.  You must additionally define a
+ * map.h by the DECLARE_MAP_FNS() macro.  You must additionally define a
  * prefix_entry_free_() function to free entries (and their keys), a
  * prefix_assign_tmp_key() function to temporarily set a stack-allocated
  * entry to hold a key, and a prefix_assign_key() function to set a
diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index 9b1c38041f..46026b6ac8 100644
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -66,7 +66,6 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/aes.h"
 #include "common/util.h"
-#include "lib/container/container.h"
 #include "common/compat.h"
 #include "common/sandbox.h"
 #include "common/util_format.h"
diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 1e7a456255..03225f1c16 100644
--- a/src/lib/crypt_ops/crypto_curve25519.c
+++ b/src/lib/crypt_ops/crypto_curve25519.c
@@ -20,7 +20,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_format.h"
diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index a977fa44f2..faccfae50b 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -16,7 +16,6 @@
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_edge.h"
-#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index 640136f487..219b93444e 100644
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -13,7 +13,6 @@
 
 #include "or/or.h"
 #include "common/address.h"
-#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "trunnel/ed25519_cert.h" /* needed for trunnel */
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index 127b58762d..7479841407 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -15,7 +15,6 @@
 #include "common/address.h"
 #include "or/bridges.h"
 #include "or/config.h"
-#include "lib/container/container.h"
 #include "or/transports.h"
 #include "common/util.h"
 
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 5212810b74..a758421cde 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -6,7 +6,6 @@
 #include "orconfig.h"
 #define DIRVOTE_PRIVATE
 #include "test/test.h"
-#include "lib/container/container.h"
 #include "or/or.h"
 #include "or/dirauth/dirvote.h"
 #include "or/nodelist.h"
diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index 12e64d0e78..b7737cafa8 100644
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -9,7 +9,6 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/dirserv.h"
-#include "lib/container/container.h"
 #include "or/entrynodes.h"
 #include "common/util.h"
 #include "or/routerparse.h"
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 5011e2285f..5da42c1339 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -16,7 +16,6 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/connection.h"
-#include "lib/container/container.h"
 #include "or/control.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"