Code Style: Delete headers that are included twice

These changes were created using the "make autostyle" from
32522, and then split into commits.

diff --git a/src/app/main/main.c b/src/app/main/main.c
index 6029ed3d2d174ec0f9d7888a6253e6d5bad643fc..4275a98bd07a1f5ab5d20cbdfd98c5b6d71a4fc5 100644 (file)
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -67,7 +67,6 @@
 #include "lib/osinfo/uname.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/fs/lockfile.h"
-#include "lib/net/resolve.h"
 #include "lib/tls/tortls.h"
 #include "lib/evloop/compat_libevent.h"
 #include "lib/encoding/confline.h"

diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
index cc07b921c38755e52cccc364df2e280d121b43f7..df273b960b1032b98fe8bf449bfb7c85699266a3 100644 (file)
--- a/src/app/main/shutdown.c
+++ b/src/app/main/shutdown.c
@@ -43,7 +43,6 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/nodelist/routerlist.h"
 #include "feature/relay/ext_orport.h"
 #include "feature/relay/relay_config.h"
 #include "feature/rend/rendcache.h"

diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c
index efc6a631654c6d9d25786221bf3ab33a87f6f77a..490d23c244b6883e317f02d6913ed238d0cd9b58 100644 (file)
--- a/src/core/mainloop/periodic.c
+++ b/src/core/mainloop/periodic.c
@@ -29,7 +29,6 @@
 #include "app/config/config.h"
 #include "core/mainloop/mainloop.h"
 #include "core/mainloop/periodic.h"
-#include "lib/evloop/compat_libevent.h"
 
 /** We disable any interval greater than this number of seconds, on the
  * grounds that it is probably an absolute time mistakenly passed in as a

diff --git a/src/core/or/or.h b/src/core/or/or.h
index c044936d385c1d2adc8281d8e1058861fca40df4..4d6afc2b0ba7bb3df683241b30a16bdb82f546db 100644 (file)
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -24,7 +24,6 @@
 
 #include "lib/arch/bytes.h"
 #include "lib/cc/compat_compiler.h"
-#include "lib/cc/torint.h"
 #include "lib/container/map.h"
 #include "lib/buf/buffers.h"
 #include "lib/container/smartlist.h"

diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c
index 063342480a2009beacb3a5da1b225574b9d386b0..5b1cd90ae5d6aca2ce951fb7e035ec94f364080b 100644 (file)
--- a/src/core/or/scheduler.c
+++ b/src/core/or/scheduler.c
@@ -12,7 +12,6 @@
 #include "lib/buf/buffers.h"
 #define TOR_CHANNEL_INTERNAL_
 #include "core/or/channeltls.h"
-#include "lib/evloop/compat_libevent.h"
 
 #include "core/or/or_connection_st.h"
 

diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c
index 3ca2c3ef913f466aa945bd28b002b708ae22f23a..991b7be037e002e8b9ac66e8c27c9b27a2c7c013 100644 (file)
--- a/src/feature/dirauth/keypin.c
+++ b/src/feature/dirauth/keypin.c
@@ -15,8 +15,6 @@
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_format.h"
-#include "lib/crypt_ops/crypto_format.h"
-#include "lib/ctime/di_ops.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/encoding/binascii.h"
 #include "lib/encoding/time_fmt.h"

diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 3d152afa16c611490bf973caac5b9c4b015fad7d..cfa5d6c6ecb69ab4be9c74bf31c60af3d7fcb7a5 100644 (file)
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -30,7 +30,6 @@
 #include "feature/rend/rendservice.h"
 #include "lib/crypt_ops/crypto_ope.h"
 #include "lib/crypt_ops/crypto_rand.h"
-#include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
 
 #include "feature/hs/hs_circuit.h"

diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index 7200218f74afb5d914d8097d33c4097469521253..00932511ab8547f2174401f7d5dcd6fdc8898b47 100644 (file)
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -23,7 +23,6 @@
 #include "lib/confmgt/unitparse.h"
 
 #include "lib/cc/compat_compiler.h"
-#include "lib/conf/conftypes.h"
 #include "lib/container/smartlist.h"
 #include "lib/encoding/confline.h"
 #include "lib/encoding/time_fmt.h"

diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c
index d493b1846b3b59acbc971e0694ff042f3c470b1e..f5cc97ff685cb52ac5235000f01cb272fb0bba5b 100644 (file)
--- a/src/lib/crypt_ops/aes_openssl.c
+++ b/src/lib/crypt_ops/aes_openssl.c
@@ -39,7 +39,6 @@ DISABLE_GCC_WARNING(redundant-decls)
 
 ENABLE_GCC_WARNING(redundant-decls)
 
-#include "lib/crypt_ops/aes.h"
 #include "lib/log/log.h"
 #include "lib/ctime/di_ops.h"
 

diff --git a/src/lib/process/env.c b/src/lib/process/env.c
index 3912ade197ff38c07f434b9affe308a544629645..88619d1e474bf422a8ae2264398ef569a6add22c 100644 (file)
--- a/src/lib/process/env.c
+++ b/src/lib/process/env.c
@@ -16,7 +16,6 @@
 #include "lib/container/smartlist.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/log.h"
-#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 70e2081c55a36a808fd4166ea22f00b52c8e3a61..78a019de84b963a1e91b58fe96f80e0f537f5564 100644 (file)
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -27,7 +27,6 @@
 #include "core/crypto/relay_crypto.h"
 #include "core/or/protover.h"
 #include "feature/nodelist/nodelist.h"
-#include "lib/evloop/compat_libevent.h"
 #include "app/config/config.h"
 
 #include "feature/nodelist/routerstatus_st.h"

diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c
index dab0a8c609af726b5cc9a53443c83f50d61371eb..7890724309a101cfd896dae88ec6719cf91ef633 100644 (file)
--- a/src/test/test_hs_control.c
+++ b/src/test/test_hs_control.c
@@ -28,8 +28,6 @@
 #include "feature/nodelist/routerstatus_st.h"
 #include "lib/crypt_ops/crypto_format.h"
 
-#include "test/test_helpers.h"
-
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif

diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index f7809b47efa3ab89549b0526a750d824aff16ead..5c95f9fe1ad5a7313d8c41c13f4b598662814e71 100644 (file)
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -10,7 +10,6 @@
 #include "core/or/channeltls.h"
 #include "feature/stats/rephist.h"
 #include "core/or/relay.h"
-#include "feature/stats/rephist.h"
 #include "lib/container/order.h"
 /* For init/free stuff */
 #include "core/or/scheduler.h"

diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index c65279fb25eb09f02cfa5c8ee05985bb3b86cacb..14bd045df798e0b442c6b3be81a77b9c42ff60b4 100644 (file)
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -30,7 +30,6 @@
 #include "core/or/half_edge_st.h"
 
 #include "feature/client/circpathbias.h"
-#include "core/or/connection_edge.h"
 
 static int srm_ncalls;
 static entry_connection_t *srm_conn;