Rectify include paths (automated)

25 files changed, 26 insertions, 26 deletions

diff --git a/src/common/address.h b/src/common/address.h
index 2c9c620c2a..317c7f329c 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -13,7 +13,7 @@
 
 //#include <sys/sockio.h>
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/container.h"
 
diff --git a/src/common/address_set.h b/src/common/address_set.h
index f4986c9b02..cfee89cfb8 100644
--- a/src/common/address_set.h
+++ b/src/common/address_set.h
@@ -14,7 +14,7 @@
 #define TOR_ADDRESS_SET_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /**
  * An address_set_t represents a set of tor_addr_t values. The implementation
diff --git a/src/common/buffers.c b/src/common/buffers.c
index fd029c26c8..41f98ddf7c 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5cd9d3ec67..5956e3484b 100644
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -13,7 +13,7 @@
 #define TOR_BUFFERS_H
 
 #include "common/compat.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 typedef struct buf_t buf_t;
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index c380369b51..0a57b95529 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -12,7 +12,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/tortls.h"
 #ifdef HAVE_UNISTD_H
diff --git a/src/common/compat.h b/src/common/compat.h
index da9bd8bcc4..0cc257fc9c 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -14,7 +14,7 @@
 #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
 #endif
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <netinet6/in6.h>
 #endif
 
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 #include "common/compat_time.h"
 
 #include <stdio.h>
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h
index 5d3883043d..ed0ece5ab9 100644
--- a/src/common/compat_threads.h
+++ b/src/common/compat_threads.h
@@ -7,7 +7,7 @@
 #define TOR_COMPAT_THREADS_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 57eb9c64c9..8a8bb2b770 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -63,7 +63,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #endif
 
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/aes.h"
 #include "common/util.h"
 #include "common/container.h"
diff --git a/src/common/crypto.h b/src/common/crypto.h
index e7d86eaf01..1324468097 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -16,7 +16,7 @@
 #include "orconfig.h"
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/util.h"
 #include "common/crypto_rsa.h"
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index 96d2e0e072..8a5b9b2018 100644
--- a/src/common/crypto_curve25519.h
+++ b/src/common/crypto_curve25519.h
@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_CURVE25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_digest.h"
 #include "common/crypto_openssl_mgt.h"
 
diff --git a/src/common/crypto_digest.h b/src/common/crypto_digest.h
index 25ca5ceda7..96ac038507 100644
--- a/src/common/crypto_digest.h
+++ b/src/common/crypto_digest.h
@@ -16,7 +16,7 @@
 #include <stdio.h>
 
 #include "common/container.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of the output of our message digest. */
 #define DIGEST_LEN 20
diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 20c04226e3..981b0dce28 100644
--- a/src/common/crypto_ed25519.h
+++ b/src/common/crypto_ed25519.h
@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_ED25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_curve25519.h"
 #include "common/util.h"
 
diff --git a/src/common/crypto_format.h b/src/common/crypto_format.h
index 325b1ef44d..47f52b94b7 100644
--- a/src/common/crypto_format.h
+++ b/src/common/crypto_format.h
@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_ed25519.h"
 
 int crypto_write_tagged_contents_to_file(const char *fname,
diff --git a/src/common/crypto_pwbox.h b/src/common/crypto_pwbox.h
index 2c73c700eb..9ed35a150e 100644
--- a/src/common/crypto_pwbox.h
+++ b/src/common/crypto_pwbox.h
@@ -4,7 +4,7 @@
 #ifndef CRYPTO_PWBOX_H_INCLUDED_
 #define CRYPTO_PWBOX_H_INCLUDED_
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #define UNPWBOX_OKAY 0
 #define UNPWBOX_BAD_SECRET -1
diff --git a/src/common/crypto_rand.h b/src/common/crypto_rand.h
index 2e05adc93d..8309bb21ca 100644
--- a/src/common/crypto_rand.h
+++ b/src/common/crypto_rand.h
@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_RAND_H
 #define TOR_CRYPTO_RAND_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 
 /* random numbers */
diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h
index c56eab319a..a80c46bb9f 100644
--- a/src/common/crypto_rsa.h
+++ b/src/common/crypto_rsa.h
@@ -17,7 +17,7 @@
 
 #include "common/crypto_digest.h"
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #include "common/compat.h"
 #include "common/util.h"
diff --git a/src/common/crypto_s2k.h b/src/common/crypto_s2k.h
index bc7224e8ea..b270897b68 100644
--- a/src/common/crypto_s2k.h
+++ b/src/common/crypto_s2k.h
@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_S2K_H_INCLUDED
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of RFC2440-style S2K specifier: the first 8 bytes are a salt, the
  * 9th describes how much iteration to do. */
diff --git a/src/common/crypto_util.h b/src/common/crypto_util.h
index 53d9027fbc..3ce34e6f23 100644
--- a/src/common/crypto_util.h
+++ b/src/common/crypto_util.h
@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_UTIL_H
 #define TOR_CRYPTO_UTIL_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** OpenSSL-based utility functions. */
 void memwipe(void *mem, uint8_t byte, size_t sz);
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 4fc1327307..a33463f74b 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -36,7 +36,7 @@
 #include "common/container.h"
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 #include "tor_queue.h"
 
diff --git a/src/common/sandbox.h b/src/common/sandbox.h
index 945d57df7e..f7c990e013 100644
--- a/src/common/sandbox.h
+++ b/src/common/sandbox.h
@@ -13,7 +13,7 @@
 #define SANDBOX_H_
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #ifndef SYS_SECCOMP
 
diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index 645c90c624..fd6834f262 100644
--- a/src/common/token_bucket.h
+++ b/src/common/token_bucket.h
@@ -9,7 +9,7 @@
 #ifndef TOR_TOKEN_BUCKET_H
 #define TOR_TOKEN_BUCKET_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */
diff --git a/src/common/util.c b/src/common/util.c
index de46cc7c87..f9d64cfb90 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -17,7 +17,7 @@
 #include "common/util.h"
 #include "common/torlog.h"
 #include "common/crypto_digest.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
diff --git a/src/common/util.h b/src/common/util.h
index b3c17db248..cb8cefb12c 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -12,7 +12,7 @@
 #define TOR_UTIL_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
 #include "common/testsupport.h"
diff --git a/src/common/util_format.c b/src/common/util_format.c
index cab2572343..420d8a1a8f 100644
--- a/src/common/util_format.c
+++ b/src/common/util_format.c
@@ -15,7 +15,7 @@
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/src/common/util_format.h b/src/common/util_format.h
index 7dd5ae5bd8..e49efd05c2 100644
--- a/src/common/util_format.h
+++ b/src/common/util_format.h
@@ -8,7 +8,7 @@
 #define TOR_UTIL_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** @{ */
 /** These macros don't check for overflow.  Use them only for constant inputs