14 files changed, 13 insertions, 13 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index eecfeb83f..b1e03cd71 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -16,7 +16,7 @@ libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \
 libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
 libor_event_a_SOURCES = compat_libevent.c
 
-noinst_HEADERS = address.h log.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h
+noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h
 
 common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
 	if test "@SHA1SUM@" != none; then \
diff --git a/src/common/address.c b/src/common/address.c
index 4569373f3..c35f04c18 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -12,7 +12,7 @@
 #include "compat.h"
 #include "util.h"
 #include "address.h"
-#include "log.h"
+#include "torlog.h"
 
 #ifdef MS_WINDOWS
 #include <process.h>
diff --git a/src/common/aes.c b/src/common/aes.c
index 2b6f0234b..a17328317 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -21,7 +21,7 @@
 #include "compat.h"
 #include "aes.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 
 /* We have 3 strategies for getting AES: Via OpenSSL's AES_encrypt function,
  * via OpenSSL's EVP_EncryptUpdate function, or via the built-in AES
diff --git a/src/common/compat.c b/src/common/compat.c
index 7b79c5cc3..ebe8c03e3 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -88,7 +88,7 @@
 #include <sys/prctl.h>
 #endif
 
-#include "log.h"
+#include "torlog.h"
 #include "util.h"
 #include "container.h"
 #include "address.h"
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 153239227..5cdd687cf 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -15,7 +15,7 @@
 #include "compat_libevent.h"
 
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
 #include <event2/event.h>
diff --git a/src/common/container.c b/src/common/container.c
index ab5a9b032..72f347034 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -13,7 +13,7 @@
 
 #include "compat.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 #include "crypto.h"
 
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 1d75555b2..bfb81d3cc 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -50,7 +50,7 @@
 
 #define CRYPTO_PRIVATE
 #include "crypto.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 #include "aes.h"
 #include "../common/util.h"
 #include "container.h"
diff --git a/src/common/log.c b/src/common/log.c
index 6bf94721f..b639e7a78 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -33,7 +33,7 @@
 #include "compat.h"
 #include "util.h"
 #define LOG_PRIVATE
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 
 #define TRUNCATED_STR "[...truncated]"
diff --git a/src/common/memarea.c b/src/common/memarea.c
index 0402e5f20..77579e63b 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -11,7 +11,7 @@
 #include "memarea.h"
 #include "util.h"
 #include "compat.h"
-#include "log.h"
+#include "torlog.h"
 
 /** If true, we try to detect any attempts to write beyond the length of a
  * memarea. */
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 256388a9f..c795d83f0 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -65,7 +65,7 @@
 #include "orconfig.h"
 #include "util.h"
 #include "compat.h"
-#include "log.h"
+#include "torlog.h"
 #define ALLOC(x) tor_malloc(x)
 #define FREE(x) tor_free(x)
 #define ASSERT(x) tor_assert(x)
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 9ebddf07b..a247d6c17 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -20,7 +20,7 @@
 
 #include "torint.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "torgzip.h"
 
 /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
diff --git a/src/common/log.h b/src/common/torlog.h
index 21219569e..21219569e 100644
--- a/src/common/log.h
+++ b/src/common/torlog.h
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 6732d55b8..b3c91a6ca 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -38,7 +38,7 @@
 #include "crypto.h"
 #include "tortls.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 #include "ht.h"
 #include <string.h>
diff --git a/src/common/util.c b/src/common/util.c
index 8531d12eb..6830ef3aa 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -15,7 +15,7 @@
 
 #include "orconfig.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #undef log
 #include "crypto.h"
 #include "torint.h"