diff --git a/src/common/include.am b/src/common/include.am
index 0b175dfec1..e6a19d8af7 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -56,7 +56,7 @@ noinst_HEADERS+= 				\
   src/common/tortls.h				\
   src/common/util.h
 
-src_common_common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
+src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
 	if test "@SHA1SUM@" != none; then \
 	  (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > src/common/common_sha1.i; \
 	elif test "@OPENSSL@" != none; then \
@@ -66,5 +66,5 @@ src_common_common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HE
 	  touch src/common/common_sha1.i; \
 	fi
 
-src_common_util_codedigest.o: src/common/common_sha1.i
-src_common_crypto.o: src/common/sha256.c
+src/common/util_codedigest.c: src/common/common_sha1.i
+src/common/crypto.c: src/common/sha256.c
diff --git a/src/or/include.am b/src/or/include.am
index 3afc9bbce5..d672f6b12e 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -125,7 +125,7 @@ noinst_HEADERS+= \
 	src/or/status.h					\
 	src/or/micro-revision.i			
 
-src_or_config_codedigest.o: src/or/or_sha1.i
+src/or/config_codedigest.c: src/or/or_sha1.i
 
 src/or/micro-revision.i: FORCE
 	@rm -f src/or/micro-revision.tmp;				\
@@ -143,7 +143,7 @@ src/or/micro-revision.i: FORCE
 	  mv src/or/micro-revision.tmp src/or/micro-revision.i;		\
 	fi; true
 
-src_or_or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)
+src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)
 	if test "@SHA1SUM@" != none; then \
 	  (cd "$(srcdir)" && "@SHA1SUM@" $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)) | \
 	  "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > src/or/or_sha1.i; \