diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c
index 9e1e273ef6..ea7261cb53 100644
--- a/src/core/crypto/onion_ntor.c
+++ b/src/core/crypto/onion_ntor.c
@@ -27,7 +27,7 @@
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "core/crypto/onion_ntor.h"
 
diff --git a/src/core/or/or.h b/src/core/or/or.h
index 2e419eefd5..9aca030c74 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -47,7 +47,7 @@
 #include "lib/log/escape.h"
 #include "lib/log/ratelim.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
 #include "lib/net/socket.h"
diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c
index 44e19985fa..fd281377df 100644
--- a/src/feature/dirauth/keypin.c
+++ b/src/feature/dirauth/keypin.c
@@ -23,7 +23,7 @@
 #include "lib/fdio/fdio.h"
 #include "lib/fs/files.h"
 #include "lib/fs/mmap.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/printf.h"
diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/nodelist/parsecommon.c
index 4f1c3fd421..3aaf8ac501 100644
--- a/src/feature/nodelist/parsecommon.c
+++ b/src/feature/nodelist/parsecommon.c
@@ -7,7 +7,7 @@
  **/
 
 #include "feature/nodelist/parsecommon.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/encoding/binascii.h"
 #include "lib/container/smartlist.h"
diff --git a/src/feature/nodelist/torcert.c b/src/feature/nodelist/torcert.c
index 172d4f9de3..a276082021 100644
--- a/src/feature/nodelist/torcert.c
+++ b/src/feature/nodelist/torcert.c
@@ -30,7 +30,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/nodelist/torcert.h"
 #include "trunnel/ed25519_cert.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "trunnel/link_handshake.h"
 #include "lib/tls/tortls.h"
 
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index e87e788f14..2ad9b15b2e 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 #endif
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/arch/bytes.h"
 #include "lib/ctime/di_ops.h"
@@ -32,7 +32,7 @@
 #include "lib/compress/compress_zlib.h"
 #include "lib/compress/compress_zstd.h"
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 /** Total number of bytes allocated for compression state overhead. */
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 3b6f91b84b..e6c8368f6a 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,9 +15,9 @@
 
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_lzma.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 #ifdef HAVE_LZMA
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 9574c47a7e..a0e82d5a99 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -16,7 +16,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_none.h"
 #include "lib/intmath/cmp.h"
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 12e6727dee..64be1d4256 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -13,7 +13,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_zlib.h"
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index 0a553db55c..0a71fed4b8 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -13,7 +13,7 @@
 
 #include "orconfig.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/compress/compress.h"
 #include "lib/compress/compress_zstd.h"
diff --git a/src/lib/container/bitarray.h b/src/lib/container/bitarray.h
index 172d56cc06..ae82a4ab4d 100644
--- a/src/lib/container/bitarray.h
+++ b/src/lib/container/bitarray.h
@@ -15,7 +15,7 @@
 #include "orconfig.h"
 #include <string.h>
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if SIZEOF_INT == 4
 #define BITARRAY_SHIFT 5
diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c
index 1cab817e18..ea2d2917c7 100644
--- a/src/lib/container/bloomfilt.c
+++ b/src/lib/container/bloomfilt.c
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/container/bloomfilt.h"
 #include "lib/intmath/bits.h"
 #include "lib/log/util_bug.h"
diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c
index 5849704e35..87d782d7ef 100644
--- a/src/lib/container/buffers.c
+++ b/src/lib/container/buffers.c
@@ -27,10 +27,10 @@
 #include <stddef.h>
 #include "lib/container/buffers.h"
 #include "lib/cc/torint.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/time/compat_time.h"
 
diff --git a/src/lib/container/handles.h b/src/lib/container/handles.h
index 21ec0dfeec..7144e1720d 100644
--- a/src/lib/container/handles.h
+++ b/src/lib/container/handles.h
@@ -52,7 +52,7 @@
 #include "orconfig.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #define HANDLE_ENTRY(name, structname)         \
   struct name ## _handle_head_t *handle_head
diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index 0602eac891..85e074e10a 100644
--- a/src/lib/container/map.c
+++ b/src/lib/container/map.c
@@ -14,7 +14,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/string/util_string.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include "lib/log/util_bug.h"
 
diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c
index c3abbff513..dc283e5f50 100644
--- a/src/lib/container/smartlist.c
+++ b/src/lib/container/smartlist.c
@@ -17,7 +17,7 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/string/compat_ctype.h"
diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c
index a01b1e16b2..ff9d4d855c 100644
--- a/src/lib/crypt_ops/aes.c
+++ b/src/lib/crypt_ops/aes.c
@@ -38,7 +38,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 ENABLE_GCC_WARNING(redundant-decls)
 
 #include "lib/crypt_ops/aes.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/ctime/di_ops.h"
 
 #ifdef ANDROID
diff --git a/src/lib/crypt_ops/aes.h b/src/lib/crypt_ops/aes.h
index a57654159a..578a1a65a2 100644
--- a/src/lib/crypt_ops/aes.h
+++ b/src/lib/crypt_ops/aes.h
@@ -14,7 +14,7 @@
  */
 
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 typedef struct aes_cnt_cipher aes_cnt_cipher_t;
 
diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index 48574016bf..5bc2da76ab 100644
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -62,7 +62,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include <unistd.h>
 #endif
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/aes.h"
diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 09f492e544..6ad2587f48 100644
--- a/src/lib/crypt_ops/crypto_curve25519.c
+++ b/src/lib/crypt_ops/crypto_curve25519.c
@@ -26,7 +26,7 @@
 #include "lib/crypt_ops/crypto_format.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include "ed25519/donna/ed25519_donna_tor.h"
diff --git a/src/lib/crypt_ops/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c
index c37e286daf..3e82996935 100644
--- a/src/lib/crypt_ops/crypto_dh.c
+++ b/src/lib/crypt_ops/crypto_dh.c
@@ -14,7 +14,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c
index 949e694053..ee5c362e38 100644
--- a/src/lib/crypt_ops/crypto_digest.c
+++ b/src/lib/crypt_ops/crypto_digest.c
@@ -14,7 +14,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_openssl_mgt.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include "keccak-tiny/keccak-tiny.h"
diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h
index 15bc5ad5b9..9facf3b981 100644
--- a/src/lib/crypt_ops/crypto_digest.h
+++ b/src/lib/crypt_ops/crypto_digest.h
@@ -15,7 +15,7 @@
 
 #include "lib/cc/torint.h"
 #include "lib/defs/digest_sizes.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Length of a sha1 message digest when encoded in base32 with trailing =
  * signs removed. */
diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c
index 985652ecba..9d2c9e9fab 100644
--- a/src/lib/crypt_ops/crypto_ed25519.c
+++ b/src/lib/crypt_ops/crypto_ed25519.c
@@ -28,7 +28,7 @@
 #include "lib/crypt_ops/crypto_format.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/encoding/binascii.h"
 #include "lib/string/util_string.h"
diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c
index 8c71b265bf..50916a8d68 100644
--- a/src/lib/crypt_ops/crypto_format.c
+++ b/src/lib/crypt_ops/crypto_format.c
@@ -24,7 +24,7 @@
 #include "lib/string/util_string.h"
 #include "lib/string/printf.h"
 #include "lib/encoding/binascii.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/fs/files.h"
 
diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 6f479b013b..fb9d0c2c6c 100644
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -26,9 +26,9 @@
 #include "lib/crypt_ops/crypto_util.h"
 #include "lib/encoding/binascii.h"
 #include "lib/intmath/weakrng.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"
diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c
index 9290414de0..5ec69d7319 100644
--- a/src/lib/crypt_ops/crypto_rsa.c
+++ b/src/lib/crypt_ops/crypto_rsa.c
@@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 
 ENABLE_GCC_WARNING(redundant-decls)
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/encoding/binascii.h"
 
 #include <string.h>
diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h
index 093f2cec6c..51fc974821 100644
--- a/src/lib/crypt_ops/crypto_rsa.h
+++ b/src/lib/crypt_ops/crypto_rsa.h
@@ -18,7 +18,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/cc/torint.h"
 #include "lib/testsupport/testsupport.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 /** Length of our public keys. */
 #define PK_BYTES (1024/8)
diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c
index 19b0885256..79988c6a91 100644
--- a/src/lib/crypt_ops/crypto_util.c
+++ b/src/lib/crypt_ops/crypto_util.c
@@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 
 ENABLE_GCC_WARNING(redundant-decls)
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 /**
diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c
index 287ff6080a..011baf2654 100644
--- a/src/lib/ctime/di_ops.c
+++ b/src/lib/ctime/di_ops.c
@@ -9,7 +9,7 @@
 #include "orconfig.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 
diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c
index df9bb4a813..e9140d9432 100644
--- a/src/lib/encoding/binascii.c
+++ b/src/lib/encoding/binascii.c
@@ -14,12 +14,12 @@
 #include "orconfig.h"
 
 #include "lib/encoding/binascii.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/cc/torint.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/intmath/muldiv.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c
index 3486b6a82b..dd5193d3a7 100644
--- a/src/lib/encoding/confline.c
+++ b/src/lib/encoding/confline.c
@@ -17,9 +17,9 @@
 
 #include "lib/encoding/confline.h"
 #include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"
diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c
index 994a52e70c..69aa7f3da5 100644
--- a/src/lib/encoding/cstring.c
+++ b/src/lib/encoding/cstring.c
@@ -11,9 +11,9 @@
  **/
 
 #include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 
 #include <string.h>
diff --git a/src/lib/encoding/keyval.c b/src/lib/encoding/keyval.c
index 53ee776fe7..d5e4e4e438 100644
--- a/src/lib/encoding/keyval.c
+++ b/src/lib/encoding/keyval.c
@@ -12,7 +12,7 @@
 #include "orconfig.h"
 #include "lib/encoding/keyval.h"
 #include "lib/log/escape.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <stdlib.h>
diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index c2ff34a91a..a921fc681c 100644
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -15,13 +15,13 @@
  **/
 
 #include "lib/encoding/time_fmt.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/escape.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/scanf.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c
index 5e5faf163c..2ee71c5598 100644
--- a/src/lib/evloop/compat_libevent.c
+++ b/src/lib/evloop/compat_libevent.c
@@ -11,7 +11,7 @@
 #include "lib/evloop/compat_libevent.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_string.h"
 
diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h
index 7a5469047c..5fda49f741 100644
--- a/src/lib/evloop/compat_libevent.h
+++ b/src/lib/evloop/compat_libevent.h
@@ -11,7 +11,7 @@
 
 #include "orconfig.h"
 #include "lib/testsupport/testsupport.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);
diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index a923fbad74..e0c26caab2 100644
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -8,10 +8,10 @@
 
 #include "lib/evloop/procmon.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 
 #ifdef HAVE_SIGNAL_H
diff --git a/src/lib/evloop/procmon.h b/src/lib/evloop/procmon.h
index b596e5cc6d..42c3788692 100644
--- a/src/lib/evloop/procmon.h
+++ b/src/lib/evloop/procmon.h
@@ -11,7 +11,7 @@
 
 #include "lib/evloop/compat_libevent.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 typedef struct tor_process_monitor_t tor_process_monitor_t;
 
diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index c07bd2e726..c4e85c7c93 100644
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -34,9 +34,9 @@
 #include "lib/evloop/compat_libevent.h"
 #include "lib/evloop/timers.h"
 #include "lib/intmath/muldiv.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/time/compat_time.h"
 
 #ifdef _WIN32
diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c
index 4d36f352e3..931f65e710 100644
--- a/src/lib/evloop/workqueue.c
+++ b/src/lib/evloop/workqueue.c
@@ -30,7 +30,7 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/intmath/weakrng.h"
 #include "lib/log/ratelim.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/alertsock.h"
 #include "lib/net/socket.h"
diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c
index 600c7f6b70..d8622bff6b 100644
--- a/src/lib/fs/conffile.c
+++ b/src/lib/fs/conffile.c
@@ -17,8 +17,8 @@
 #include "lib/fs/dir.h"
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 static smartlist_t *config_get_file_list(const char *path,
diff --git a/src/lib/fs/dir.c b/src/lib/fs/dir.c
index cc339f747e..6c24460005 100644
--- a/src/lib/fs/dir.c
+++ b/src/lib/fs/dir.c
@@ -14,12 +14,12 @@
 #include "lib/fs/path.h"
 #include "lib/fs/userdb.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/container/smartlist.h"
 #include "lib/sandbox/sandbox.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/compat_string.h"
 
diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c
index 4e0a398baa..c71e4d2a37 100644
--- a/src/lib/fs/files.c
+++ b/src/lib/fs/files.c
@@ -16,11 +16,11 @@
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
 #include "lib/container/smartlist.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/escape.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"
diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c
index 972fd5658d..ca1711c344 100644
--- a/src/lib/fs/lockfile.c
+++ b/src/lib/fs/lockfile.c
@@ -13,9 +13,9 @@
 #include "orconfig.h"
 #include "lib/fs/files.h"
 #include "lib/fs/lockfile.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
diff --git a/src/lib/fs/mmap.c b/src/lib/fs/mmap.c
index 2d758c1b5f..e7da6fc63a 100644
--- a/src/lib/fs/mmap.c
+++ b/src/lib/fs/mmap.c
@@ -11,11 +11,11 @@
 
 #include "lib/fs/mmap.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/string/compat_string.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 708ff0505a..eb5170920c 100644
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -10,8 +10,8 @@
  **/
 
 #include "lib/fs/path.h"
-#include "lib/malloc/util_malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/malloc/malloc.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"
diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c
index 1cda2374d8..014eb4d9eb 100644
--- a/src/lib/fs/storagedir.c
+++ b/src/lib/fs/storagedir.c
@@ -20,9 +20,9 @@
 #include "lib/fs/files.h"
 #include "lib/fs/mmap.h"
 #include "lib/log/escape.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/memarea/memarea.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"
diff --git a/src/lib/fs/userdb.c b/src/lib/fs/userdb.c
index 3d7a9da59d..df2935baa8 100644
--- a/src/lib/fs/userdb.c
+++ b/src/lib/fs/userdb.c
@@ -12,8 +12,8 @@
 #include "lib/fs/userdb.h"
 
 #ifndef _WIN32
-#include "lib/malloc/util_malloc.h"
-#include "lib/log/torlog.h"
+#include "lib/malloc/malloc.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <pwd.h>
diff --git a/src/lib/lock/compat_mutex.c b/src/lib/lock/compat_mutex.c
index bfab6dd29b..b53676cf49 100644
--- a/src/lib/lock/compat_mutex.c
+++ b/src/lib/lock/compat_mutex.c
@@ -10,7 +10,7 @@
  **/
 
 #include "lib/lock/compat_mutex.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Return a newly allocated, ready-for-use mutex. */
 tor_mutex_t *
diff --git a/src/lib/lock/compat_mutex.h b/src/lib/lock/compat_mutex.h
index f467aa5dba..f8689422b1 100644
--- a/src/lib/lock/compat_mutex.h
+++ b/src/lib/lock/compat_mutex.h
@@ -14,7 +14,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include <pthread.h>
diff --git a/src/lib/log/escape.c b/src/lib/log/escape.c
index b6b20183ba..37d7e0fdc4 100644
--- a/src/lib/log/escape.c
+++ b/src/lib/log/escape.c
@@ -12,7 +12,7 @@
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Allocate and return a new string representing the contents of <b>s</b>,
  * surrounded by quotes and using standard C escapes.
diff --git a/src/lib/log/include.am b/src/lib/log/include.am
index f0491b3863..b5a1c5ca26 100644
--- a/src/lib/log/include.am
+++ b/src/lib/log/include.am
@@ -8,7 +8,7 @@ endif
 src_lib_libtor_log_a_SOURCES =			\
 	src/lib/log/escape.c			\
 	src/lib/log/ratelim.c			\
-	src/lib/log/torlog.c			\
+	src/lib/log/log.c			\
 	src/lib/log/util_bug.c
 
 if WIN32
@@ -26,6 +26,6 @@ src/lib/log/torlog.$(OBJEXT) \
 noinst_HEADERS +=					\
 	src/lib/log/escape.h				\
 	src/lib/log/ratelim.h				\
-	src/lib/log/torlog.h				\
+	src/lib/log/log.h				\
 	src/lib/log/util_bug.h				\
 	src/lib/log/win32err.h
diff --git a/src/lib/log/torlog.c b/src/lib/log/log.c
similarity index 99%
rename from src/lib/log/torlog.c
rename to src/lib/log/log.c
index 1c9f33790d..8349041ab1 100644
--- a/src/lib/log/torlog.c
+++ b/src/lib/log/log.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file torlog.c
+ * \file log.c
  * \brief Functions to send messages to log files or the console.
  **/
 
@@ -31,7 +31,7 @@
 #endif
 
 #define LOG_PRIVATE
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/ratelim.h"
 #include "lib/lock/compat_mutex.h"
 #include "lib/smartlist_core/smartlist_core.h"
@@ -41,11 +41,11 @@
 #include "lib/intmath/bits.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/util_string.h"
 #include "lib/wallclock/tor_gettimeofday.h"
 #include "lib/wallclock/approx_time.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 #include "lib/fdio/fdio.h"
 
 #ifdef HAVE_ANDROID_LOG_H
diff --git a/src/lib/log/torlog.h b/src/lib/log/log.h
similarity index 99%
rename from src/lib/log/torlog.h
rename to src/lib/log/log.h
index c24b638191..493409756f 100644
--- a/src/lib/log/torlog.h
+++ b/src/lib/log/log.h
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file torlog.h
+ * \file log.h
  *
  * \brief Headers for log.c
  **/
diff --git a/src/lib/log/ratelim.c b/src/lib/log/ratelim.c
index fba702d7f0..2d0e8b17ca 100644
--- a/src/lib/log/ratelim.c
+++ b/src/lib/log/ratelim.c
@@ -9,7 +9,7 @@
  **/
 
 #include "lib/log/ratelim.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 /** If the rate-limiter <b>lim</b> is ready at <b>now</b>, return the number
diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
index 78af08f022..42b3670a71 100644
--- a/src/lib/log/util_bug.c
+++ b/src/lib/log/util_bug.c
@@ -9,13 +9,13 @@
 
 #include "orconfig.h"
 #include "lib/log/util_bug.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/err/backtrace.h"
 #ifdef TOR_UNIT_TESTS
 #include "lib/smartlist_core/smartlist_core.h"
 #include "lib/smartlist_core/smartlist_foreach.h"
 #endif
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 #include <string.h>
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index a0753c807b..61ee60f729 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -38,7 +38,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/compat_compiler.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/testsupport/testsupport.h"
 
 /* Replace assert() with a variant that sends failures to the log before
diff --git a/src/lib/log/win32err.c b/src/lib/log/win32err.c
index 6603ed4648..41f563bfa5 100644
--- a/src/lib/log/win32err.c
+++ b/src/lib/log/win32err.c
@@ -11,7 +11,7 @@
 #ifdef _WIN32
 #include "orconfig.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <tchar.h>
 #include <windows.h>
diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am
index 50de9cb736..502cc1c6b7 100644
--- a/src/lib/malloc/include.am
+++ b/src/lib/malloc/include.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-malloc-testing.a
 endif
 
 src_lib_libtor_malloc_a_SOURCES =			\
-	src/lib/malloc/util_malloc.c
+	src/lib/malloc/malloc.c
 
 if USE_OPENBSD_MALLOC
 src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c
@@ -18,4 +18,4 @@ src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_lib_libtor_malloc_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=					\
-	src/lib/malloc/util_malloc.h
+	src/lib/malloc/malloc.h
diff --git a/src/lib/malloc/util_malloc.c b/src/lib/malloc/malloc.c
similarity index 99%
rename from src/lib/malloc/util_malloc.c
rename to src/lib/malloc/malloc.c
index f3b0e50c70..271e84071a 100644
--- a/src/lib/malloc/util_malloc.c
+++ b/src/lib/malloc/malloc.c
@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.c
+ * \file malloc.c
  * \brief Wrappers for C malloc code, and replacements for items that
  *   may be missing.
  **/
@@ -16,7 +16,7 @@
 
 #include "lib/testsupport/testsupport.h"
 #define UTIL_MALLOC_PRIVATE
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/cc/torint.h"
 #include "lib/err/torerr.h"
 
diff --git a/src/lib/malloc/util_malloc.h b/src/lib/malloc/malloc.h
similarity index 99%
rename from src/lib/malloc/util_malloc.h
rename to src/lib/malloc/malloc.h
index a1e9531176..26ee30742e 100644
--- a/src/lib/malloc/util_malloc.h
+++ b/src/lib/malloc/malloc.h
@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.h
+ * \file malloc.h
  * \brief Headers for util_malloc.c
  **/
 
diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index 9d494ab2d4..dd7c48c079 100644
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -17,9 +17,9 @@
 #include "lib/arch/bytes.h"
 #include "lib/cc/torint.h"
 #include "lib/container/smartlist.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifndef DISABLE_MEMORY_SENTINELS
 
diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c
index b5a74ce624..648f54e0c5 100644
--- a/src/lib/meminfo/meminfo.c
+++ b/src/lib/meminfo/meminfo.c
@@ -15,8 +15,8 @@
 #include "lib/cc/compat_compiler.h"
 #include "lib/cc/torint.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index 3b624da096..619fa13e9b 100644
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -42,9 +42,9 @@
 #include "lib/net/socket.h"
 #include "lib/container/smartlist.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/escape.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/inaddr.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"
diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c
index 2e6a096a06..c52ea2784e 100644
--- a/src/lib/net/buffers_net.c
+++ b/src/lib/net/buffers_net.c
@@ -12,7 +12,7 @@
 #define BUFFERS_PRIVATE
 #include "lib/net/buffers_net.h"
 #include "lib/container/buffers.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/nettypes.h"
 
diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c
index ff9c93989a..7c8df3e307 100644
--- a/src/lib/net/resolve.c
+++ b/src/lib/net/resolve.c
@@ -12,7 +12,7 @@
 
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 #include "lib/string/util_string.h"
 
diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c
index 1b3238d998..5847bb8734 100644
--- a/src/lib/net/socket.c
+++ b/src/lib/net/socket.c
@@ -15,7 +15,7 @@
 #include "lib/cc/compat_compiler.h"
 #include "lib/err/torerr.h"
 #include "lib/lock/compat_mutex.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #ifdef _WIN32
diff --git a/src/lib/process/daemon.c b/src/lib/process/daemon.c
index 6863d05d7e..671579838e 100644
--- a/src/lib/process/daemon.c
+++ b/src/lib/process/daemon.c
@@ -14,7 +14,7 @@
 #ifndef _WIN32
 
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/thread/threads.h"
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/src/lib/process/env.c b/src/lib/process/env.c
index 244cd4a4eb..dc0b63b499 100644
--- a/src/lib/process/env.c
+++ b/src/lib/process/env.c
@@ -11,12 +11,12 @@
 #include "orconfig.h"
 #include "lib/process/env.h"
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/container/smartlist.h"
 #include "lib/log/util_bug.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/lib/process/pidfile.c b/src/lib/process/pidfile.c
index 17ff8be600..ea008168ab 100644
--- a/src/lib/process/pidfile.c
+++ b/src/lib/process/pidfile.c
@@ -11,7 +11,7 @@
 #include "orconfig.h"
 #include "lib/process/pidfile.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/lib/process/restrict.c b/src/lib/process/restrict.c
index fc1a308806..bca325e5bc 100644
--- a/src/lib/process/restrict.c
+++ b/src/lib/process/restrict.c
@@ -11,7 +11,7 @@
 #include "orconfig.h"
 #include "lib/process/restrict.h"
 #include "lib/intmath/cmp.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/net/socket.h"
 
diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c
index 5423259a66..d038039ff4 100644
--- a/src/lib/process/setuid.c
+++ b/src/lib/process/setuid.c
@@ -17,9 +17,9 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/fs/userdb.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/lib/process/subprocess.c b/src/lib/process/subprocess.c
index 9a12f5e76e..70851c15e0 100644
--- a/src/lib/process/subprocess.c
+++ b/src/lib/process/subprocess.c
@@ -13,10 +13,10 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/process/env.h"
 #include "lib/process/waitpid.h"
 #include "lib/string/compat_ctype.h"
diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c
index 27f69b08f0..32ba4530da 100644
--- a/src/lib/process/waitpid.c
+++ b/src/lib/process/waitpid.c
@@ -13,9 +13,9 @@
 #ifndef _WIN32
 
 #include "lib/process/waitpid.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "ht.h"
 
 #ifdef HAVE_SYS_WAIT_H
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 25dd6d1c26..5510754327 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -36,10 +36,10 @@
 #include "lib/sandbox/sandbox.h"
 #include "lib/container/map.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/cc/torint.h"
 #include "lib/net/resolve.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
 #include "tor_queue.h"
diff --git a/src/lib/smartlist_core/smartlist_core.c b/src/lib/smartlist_core/smartlist_core.c
index b9c5f728ce..8364a8180b 100644
--- a/src/lib/smartlist_core/smartlist_core.c
+++ b/src/lib/smartlist_core/smartlist_core.c
@@ -11,7 +11,7 @@
  **/
 
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/smartlist_core/smartlist_core.h"
 
 #include <stdlib.h>
diff --git a/src/lib/smartlist_core/smartlist_split.c b/src/lib/smartlist_core/smartlist_split.c
index 9c8368f665..f63894869c 100644
--- a/src/lib/smartlist_core/smartlist_split.c
+++ b/src/lib/smartlist_core/smartlist_split.c
@@ -14,7 +14,7 @@
 #include "lib/err/torerr.h"
 #include "lib/string/util_string.h"
 #include "lib/string/compat_ctype.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 
diff --git a/src/lib/string/printf.c b/src/lib/string/printf.c
index f8be3b4704..82d38242dd 100644
--- a/src/lib/string/printf.c
+++ b/src/lib/string/printf.c
@@ -11,7 +11,7 @@
 #include "lib/string/printf.h"
 #include "lib/err/torerr.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/lib/term/getpass.c b/src/lib/term/getpass.c
index 590411b715..27a27179b6 100644
--- a/src/lib/term/getpass.c
+++ b/src/lib/term/getpass.c
@@ -11,7 +11,7 @@
 #include "lib/term/getpass.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
index 246c6254bb..934067e4c1 100644
--- a/src/lib/thread/compat_pthreads.c
+++ b/src/lib/thread/compat_pthreads.c
@@ -12,7 +12,7 @@
 
 #include "orconfig.h"
 #include "lib/thread/threads.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <sys/time.h>
diff --git a/src/lib/thread/compat_threads.c b/src/lib/thread/compat_threads.c
index 972960e242..24129946b2 100644
--- a/src/lib/thread/compat_threads.c
+++ b/src/lib/thread/compat_threads.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include "lib/thread/threads.h"
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #include <string.h>
diff --git a/src/lib/thread/compat_winthreads.c b/src/lib/thread/compat_winthreads.c
index 7f9877d21e..799eeda1b4 100644
--- a/src/lib/thread/compat_winthreads.c
+++ b/src/lib/thread/compat_winthreads.c
@@ -15,7 +15,7 @@
 #include <windows.h>
 #include <process.h>
 #include "lib/thread/threads.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 
diff --git a/src/lib/thread/numcpus.c b/src/lib/thread/numcpus.c
index b8763f118f..cca15eb7aa 100644
--- a/src/lib/thread/numcpus.c
+++ b/src/lib/thread/numcpus.c
@@ -10,7 +10,7 @@
 
 #include "orconfig.h"
 #include "lib/thread/numcpus.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c
index 2ea6eca988..d26cb6880d 100644
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@ -13,7 +13,7 @@
 #include "lib/time/compat_time.h"
 
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/intmath/muldiv.h"
 #include "lib/intmath/bits.h"
diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c
index 6af12501c7..8617110e52 100644
--- a/src/lib/time/tvdiff.c
+++ b/src/lib/time/tvdiff.c
@@ -11,7 +11,7 @@
 #include "lib/time/tvdiff.h"
 
 #include "lib/cc/compat_compiler.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c
index 0e112b59cf..69ae4f7fc0 100644
--- a/src/lib/tls/buffers_tls.c
+++ b/src/lib/tls/buffers_tls.c
@@ -15,7 +15,7 @@
 #include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "lib/cc/torint.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/tls/tortls.h"
 
diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c
index 1cd22a7eba..073cae02ba 100644
--- a/src/lib/tls/tortls.c
+++ b/src/lib/tls/tortls.c
@@ -52,7 +52,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 
 #define TORTLS_PRIVATE
 #include "lib/tls/tortls.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/container/smartlist.h"
 #include "lib/string/compat_string.h"
diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h
index a764f552ea..191d94226d 100644
--- a/src/lib/trace/debug.h
+++ b/src/lib/trace/debug.h
@@ -9,7 +9,7 @@
 #ifndef TOR_TRACE_LOG_DEBUG_H
 #define TOR_TRACE_LOG_DEBUG_H
 
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 /* Stringify pre-processor trick. */
 #define XSTR(d) STR(d)
diff --git a/src/lib/wallclock/include.am b/src/lib/wallclock/include.am
index 7864c21e16..1961639bd7 100644
--- a/src/lib/wallclock/include.am
+++ b/src/lib/wallclock/include.am
@@ -7,7 +7,7 @@ endif
 
 src_lib_libtor_wallclock_a_SOURCES =			\
 	src/lib/wallclock/approx_time.c			\
-	src/lib/wallclock/tm_cvt.c			\
+	src/lib/wallclock/time_to_tm.c			\
 	src/lib/wallclock/tor_gettimeofday.c
 
 src_lib_libtor_wallclock_testing_a_SOURCES = \
@@ -18,5 +18,5 @@ src_lib_libtor_wallclock_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 noinst_HEADERS +=					\
 	src/lib/wallclock/approx_time.h			\
 	src/lib/wallclock/timeval.h			\
-	src/lib/wallclock/tm_cvt.h			\
+	src/lib/wallclock/time_to_tm.h			\
 	src/lib/wallclock/tor_gettimeofday.h
diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/time_to_tm.c
similarity index 98%
rename from src/lib/wallclock/tm_cvt.c
rename to src/lib/wallclock/time_to_tm.c
index 4a51a4ab3a..6543b97e37 100644
--- a/src/lib/wallclock/tm_cvt.c
+++ b/src/lib/wallclock/time_to_tm.c
@@ -4,14 +4,14 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file tm_cvt.c
- * \brief Convert to and from struct tm, portably.
+ * \file time_to_tm.c
+ * \brief Convert to struct tm, portably.
  **/
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
 #include "lib/cc/compat_compiler.h"
-#include "lib/wallclock/tm_cvt.h"
+#include "lib/wallclock/time_to_tm.h"
 #include "lib/string/printf.h"
 #include "lib/err/torerr.h"
 
diff --git a/src/lib/wallclock/tm_cvt.h b/src/lib/wallclock/time_to_tm.h
similarity index 79%
rename from src/lib/wallclock/tm_cvt.h
rename to src/lib/wallclock/time_to_tm.h
index a1cdc80ef1..0527a97b34 100644
--- a/src/lib/wallclock/tm_cvt.h
+++ b/src/lib/wallclock/time_to_tm.h
@@ -4,12 +4,12 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file tm_cvt.h
- * \brief Header for tm_cvt.c
+ * \file time_to_tm.h
+ * \brief Header for time_to_tm.c
  **/
 
-#ifndef TOR_WALLCLOCK_TM_CVT_H
-#define TOR_WALLCLOCK_TM_CVT_H
+#ifndef TOR_WALLCLOCK_TIME_TO_TM_H
+#define TOR_WALLCLOCK_TIME_TO_TM_H
 
 #include <sys/types.h>
 
diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index 61dc2144b4..2fbb275614 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -12,7 +12,7 @@
 #include "app/config/config.h"
 #include "core/mainloop/connection.h"
 #include "feature/dircache/directory.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #include "feature/dircommon/dir_connection_st.h"
 
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 184bb52ee2..ca007a2c7f 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -13,7 +13,7 @@
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "core/proto/proto_socks.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #include "core/or/entry_connection_st.h"
 #include "core/or/socks_request_st.h"
diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index e814555ba1..0d0f7574c3 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2015-2018, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 #define LOG_PRIVATE
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "test/log_test_helpers.h"
 
 /**
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 8a4610e904..c879013ed6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -5,7 +5,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 716cff36e0..89cbca2066 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -9,7 +9,7 @@
 #undef TOR_COVERAGE
 #include "core/or/or.h"
 #include "lib/err/backtrace.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c
index b1a5613eaf..92f9cbab2f 100644
--- a/src/test/test_crypto_openssl.c
+++ b/src/test/test_crypto_openssl.c
@@ -10,7 +10,7 @@
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/encoding/binascii.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "test/test.h"
 
 #include <openssl/evp.h>
diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index 2e3b8800ac..cd685a4af7 100644
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -7,7 +7,7 @@
 #include "core/or/or.h"
 #include "app/config/config.h"
 #include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "test/test.h"
 #include "lib/process/subprocess.h"
 
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 3cc23955ad..15c406d2ff 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -12,7 +12,7 @@
 #include <math.h>
 
 #include "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "tor_queue.h"
 #include "core/or/status.h"
 #include "core/or/circuitlist.h"
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index 2b40ed72d9..54e5eca4f9 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls)
 ENABLE_GCC_WARNING(redundant-decls)
 
 #include "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "app/config/config.h"
 #include "lib/tls/tortls.h"
 #include "app/config/or_state_st.h"
diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index 5021e89dff..c5b24487b1 100644
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -7,7 +7,7 @@
 #define UTIL_PRIVATE
 #define SUBPROCESS_PRIVATE
 #include "lib/crypt_ops/crypto.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
 #include "lib/process/subprocess.h"
 #include "lib/process/waitpid.h"
 #include "lib/string/printf.h"
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index efae621d09..ff924152a6 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -38,8 +38,8 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/binascii.h"
 #include "lib/encoding/time_fmt.h"
 #include "lib/fs/files.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
 #include "lib/net/resolve.h"
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 9358cc8a6e..d5b4987832 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -6,8 +6,8 @@
 #include "orconfig.h"
 
 #include "lib/arch/bytes.h"
-#include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/log/log.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/resolve.h"
 #include "lib/net/socket.h"
diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index e81396aeea..c4118fce4c 100644
--- a/src/trunnel/trunnel-local.h
+++ b/src/trunnel/trunnel-local.h
@@ -3,7 +3,7 @@
 #define TRUNNEL_LOCAL_H_INCLUDED
 
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/util_bug.h"
 
 #define trunnel_malloc tor_malloc