Rename util_malloc to malloc.

56 files changed, 59 insertions, 59 deletions

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/lib/compress/compress.c b/src/lib/compress/compress.c
index e87e788f14..ff1aea47a4 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -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..9091832ed3 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -17,7 +17,7 @@
 #include "lib/compress/compress_lzma.h"
 #include "lib/log/torlog.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/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..525747a4c9 100644
--- a/src/lib/container/buffers.c
+++ b/src/lib/container/buffers.c
@@ -30,7 +30,7 @@
 #include "lib/log/torlog.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.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_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_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 6f479b013b..e2d72a77c0 100644
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -28,7 +28,7 @@
 #include "lib/intmath/weakrng.h"
 #include "lib/log/torlog.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/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..7499d64720 100644
--- a/src/lib/encoding/binascii.c
+++ b/src/lib/encoding/binascii.c
@@ -19,7 +19,7 @@
 #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..9b17629537 100644
--- a/src/lib/encoding/confline.c
+++ b/src/lib/encoding/confline.c
@@ -19,7 +19,7 @@
 #include "lib/encoding/cstring.h"
 #include "lib/log/torlog.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..3e0db712f9 100644
--- a/src/lib/encoding/cstring.c
+++ b/src/lib/encoding/cstring.c
@@ -13,7 +13,7 @@
 #include "lib/encoding/cstring.h"
 #include "lib/log/torlog.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/time_fmt.c b/src/lib/encoding/time_fmt.c
index c2ff34a91a..8ce15e7477 100644
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -18,7 +18,7 @@
 #include "lib/log/torlog.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"
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..53c458f159 100644
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -11,7 +11,7 @@
 #include "lib/log/torlog.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/timers.c b/src/lib/evloop/timers.c
index c07bd2e726..4580b89e3c 100644
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -36,7 +36,7 @@
 #include "lib/intmath/muldiv.h"
 #include "lib/log/torlog.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/fs/conffile.c b/src/lib/fs/conffile.c
index 600c7f6b70..3a4d95f450 100644
--- a/src/lib/fs/conffile.c
+++ b/src/lib/fs/conffile.c
@@ -18,7 +18,7 @@
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.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..0f2a5e2359 100644
--- a/src/lib/fs/dir.c
+++ b/src/lib/fs/dir.c
@@ -19,7 +19,7 @@
 #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..9012fd64f2 100644
--- a/src/lib/fs/files.c
+++ b/src/lib/fs/files.c
@@ -20,7 +20,7 @@
 #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..a4e3c427db 100644
--- a/src/lib/fs/lockfile.c
+++ b/src/lib/fs/lockfile.c
@@ -15,7 +15,7 @@
 #include "lib/fs/lockfile.h"
 #include "lib/log/torlog.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..7d91945bb9 100644
--- a/src/lib/fs/mmap.c
+++ b/src/lib/fs/mmap.c
@@ -15,7 +15,7 @@
 #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..9b32b2ebd3 100644
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -10,7 +10,7 @@
  **/
 
 #include "lib/fs/path.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/printf.h"
diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c
index 1cda2374d8..4db56b02f8 100644
--- a/src/lib/fs/storagedir.c
+++ b/src/lib/fs/storagedir.c
@@ -22,7 +22,7 @@
 #include "lib/log/escape.h"
 #include "lib/log/torlog.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..1e772b8fbd 100644
--- a/src/lib/fs/userdb.c
+++ b/src/lib/fs/userdb.c
@@ -12,7 +12,7 @@
 #include "lib/fs/userdb.h"
 
 #ifndef _WIN32
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.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/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/torlog.c b/src/lib/log/torlog.c
index 1c9f33790d..46d1217554 100644
--- a/src/lib/log/torlog.c
+++ b/src/lib/log/torlog.c
@@ -41,7 +41,7 @@
 #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"
diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
index 78af08f022..e3c8df0d64 100644
--- a/src/lib/log/util_bug.c
+++ b/src/lib/log/util_bug.c
@@ -15,7 +15,7 @@
 #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/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
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
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..3a93d89ee2 100644
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -19,7 +19,7 @@
 #include "lib/container/smartlist.h"
 #include "lib/log/torlog.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..01080367fa 100644
--- a/src/lib/meminfo/meminfo.c
+++ b/src/lib/meminfo/meminfo.c
@@ -16,7 +16,7 @@
 #include "lib/cc/torint.h"
 #include "lib/fs/files.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.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..ca0c2a46c4 100644
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -44,7 +44,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/log/torlog.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/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/process/env.c b/src/lib/process/env.c
index 244cd4a4eb..5b959d05f8 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/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c
index 5423259a66..13b352dad0 100644
--- a/src/lib/process/setuid.c
+++ b/src/lib/process/setuid.c
@@ -19,7 +19,7 @@
 #include "lib/fs/userdb.h"
 #include "lib/log/torlog.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..d2bbb61c34 100644
--- a/src/lib/process/subprocess.c
+++ b/src/lib/process/subprocess.c
@@ -16,7 +16,7 @@
 #include "lib/log/torlog.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..b829cb1b09 100644
--- a/src/lib/process/waitpid.c
+++ b/src/lib/process/waitpid.c
@@ -15,7 +15,7 @@
 #include "lib/process/waitpid.h"
 #include "lib/log/torlog.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..7768bee06e 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -39,7 +39,7 @@
 #include "lib/log/torlog.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/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_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/tools/tor-gencert.c b/src/tools/tor-gencert.c
index efae621d09..0e3ab24083 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/time_fmt.h"
 #include "lib/fs/files.h"
 #include "lib/log/torlog.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/resolve.h"
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 9358cc8a6e..a4d5184b4a 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -7,7 +7,7 @@
 
 #include "lib/arch/bytes.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.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