diff --git a/src/or/config.c b/src/or/config.c
index b0141b9c0e..bdc963a86f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -111,7 +111,7 @@
 #include <shlobj.h>
 #endif
 
-#include "common/conffile.h"
+#include "lib/fs/conffile.h"
 #include "common/procmon.h"
 
 #include "or/dirauth/dirvote.h"
diff --git a/src/or/conscache.c b/src/or/conscache.c
index 63ff0db787..bc3a09509d 100644
--- a/src/or/conscache.c
+++ b/src/or/conscache.c
@@ -6,7 +6,7 @@
 #include "or/config.h"
 #include "or/conscache.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "common/storagedir.h"
+#include "lib/fs/storagedir.h"
 
 #define CCE_MAGIC 0x17162253
 
diff --git a/src/test/test_config.c b/src/test/test_config.c
index dcdaa2ed59..4676cc8974 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -48,7 +48,7 @@
 #include "or/port_cfg_st.h"
 #include "or/routerinfo_st.h"
 
-#include "common/conffile.h"
+#include "lib/fs/conffile.h"
 
 static void
 test_config_addressmap(void *arg)
diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c
index 4dd7673521..d07d35e096 100644
--- a/src/test/test_storagedir.c
+++ b/src/test/test_storagedir.c
@@ -3,7 +3,7 @@
 
 #include "or/or.h"
 #include "lib/crypt_ops/crypto_rand.h"
-#include "common/storagedir.h"
+#include "lib/fs/storagedir.h"
 #include "test/test.h"
 
 #ifdef HAVE_UTIME_H