diff --git a/src/common/include.am b/src/common/include.am
index 6525e0b357..c39ad8d16b 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -1,14 +1,14 @@
 
 noinst_LIBRARIES += \
 	src/common/libor.a \
-        src/common/libor-ctime.a \
+	src/common/libor-ctime.a \
 	src/common/libor-crypto.a \
 	src/common/libor-event.a
 
 if UNITTESTS_ENABLED
 noinst_LIBRARIES += \
 	src/common/libor-testing.a \
-        src/common/libor-ctime-testing.a \
+	src/common/libor-ctime-testing.a \
 	src/common/libor-crypto-testing.a \
 	src/common/libor-event-testing.a
 endif
diff --git a/src/test/include.am b/src/test/include.am
index db496aefd8..fa660f5302 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -254,7 +254,7 @@ EXTRA_DIST += \
 	src/test/slownacl_curve25519.py \
 	src/test/zero_length_keys.sh \
 	src/test/test_keygen.sh \
-        src/test/test_zero_length_keys.sh \
-        src/test/test_ntor.sh src/test/test_bt.sh \
+	src/test/test_zero_length_keys.sh \
+	src/test/test_ntor.sh src/test/test_bt.sh \
 	src/test/test-network.sh \
 	src/test/test_switch_id.sh
diff --git a/src/tools/include.am b/src/tools/include.am
index 39e42a74a2..d0185b5887 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -17,7 +17,7 @@ src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_tools_tor_cov_resolve_LDADD = src/common/libor-testing.a \
 	src/common/libor-ctime-testing.a \
-        @TOR_LIB_MATH@ @TOR_LIB_WS32@
+	@TOR_LIB_MATH@ @TOR_LIB_WS32@
 endif
 
 src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c
@@ -26,8 +26,8 @@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \
     src/common/libor-ctime.a \
     $(LIBKECCAK_TINY) \
     $(LIBDONNA) \
-        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-        @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+    @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 
 if COVERAGE_ENABLED
 src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c
@@ -39,8 +39,8 @@ src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \
     src/common/libor-ctime-testing.a \
     $(LIBKECCAK_TINY) \
     $(LIBDONNA) \
-        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-        @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+    @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 endif
 
 src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c
@@ -50,7 +50,7 @@ src_tools_tor_checkkey_LDADD = src/common/libor.a \
     src/common/libor-crypto.a \
     $(LIBKECCAK_TINY) \
     $(LIBDONNA) \
-        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-        @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+    @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 
 EXTRA_DIST += src/tools/tor-fw-helper/README