diff --git a/.gitignore b/.gitignore
index f141fee17649edcffdd2b50c8d4e8b472c7631ee..025d7202d1a2e77d62b08f97c0ea4970181b24a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,10 +173,14 @@ uptime-*.json
 /src/lib/libtor-ctime-testing.a
 /src/lib/libtor-err.a
 /src/lib/libtor-err-testing.a
+/src/lib/libtor-fdio.a
+/src/lib/libtor-fdio-testing.a
 /src/lib/libtor-intmath.a
 /src/lib/libtor-intmath-testing.a
 /src/lib/libtor-lock.a
 /src/lib/libtor-lock-testing.a
+/src/lib/libtor-log.a
+/src/lib/libtor-log-testing.a
 /src/lib/libtor-malloc.a
 /src/lib/libtor-malloc-testing.a
 /src/lib/libtor-string.a
diff --git a/src/common/.may_include b/src/common/.may_include
index 484b57e10082275790cdcc59eff05c7a2a8cc154..fab9ad0da89ac0778322a1861955681f164951d4 100644
--- a/src/common/.may_include
+++ b/src/common/.may_include
@@ -5,7 +5,6 @@ lib/*/*.h
 # XXXX These all belong somewhere else
 ht.h
 linux_syscalls.inc
-micro-revision.i
 siphash.h
 src/ext/timeouts/timeout.c
 tor_queue.h
diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include
index 4f6244c2d377de0508e0292891b263a435c105bc..36a164cce06b463d1cee16742c4f77115c5afc2d 100644
--- a/src/lib/log/.may_include
+++ b/src/lib/log/.may_include
@@ -3,7 +3,9 @@ orconfig.h
 lib/cc/*.h
 lib/container/smartlist.h
 lib/err/*.h
+lib/fdio/*.h
 lib/intmath/*.h
+lib/lock/*.h
 lib/log/*.h
 lib/malloc/*.h
 lib/string/*.h
diff --git a/src/lib/wallclock/.may_include b/src/lib/wallclock/.may_include
index 686d9196fd7d0ecf354101a0a54f35a6aaf4640a..dc010da06320aba29d71fc89f1932a5f159f24be 100644
--- a/src/lib/wallclock/.may_include
+++ b/src/lib/wallclock/.may_include
@@ -1,4 +1,6 @@
 orconfig.h
+lib/cc/*.h
 lib/err/*.h
 lib/wallclock/*.h
+lib/string/*.h
 lib/testsupport/*.h