 -	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
 -	src/common/libor-event.a src/trunnel/libor-trunnel.a \
 -	src/trace/libor-trace.a \
--	$(rust_ldadd) \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
--	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
--	@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
--	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
+-	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+-	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+-	$(rust_ldadd)
 -
 -if COVERAGE_ENABLED
 -src_or_tor_cov_SOURCES = src/or/tor_main.c

 
 if BUILD_NT_SERVICES
 tor_platform_source=src/or/ntmain.c
@@ -106,51 +98,16 @@
 	$(tor_platform_source)
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)

-  src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
 
-AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""		\
+AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or \
+		-DSHARE_DATADIR="\"$(datadir)\"" \
 		-DLOCALSTATEDIR="\"$(localstatedir)\""	\
 		-DBINDIR="\"$(bindir)\""
 
