diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index b7e2fbf..5ff23db 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -273,7 +273,7 @@ endif
 LIBZ := contrib/install/$(ARCH)/lib/libz.a
 
 ifndef CROSSHOST
-	SQLITE_INCLUDE_DIR := /usr/include
+	SQLITE_INCLUDE_DIR := ${sqlite}/include
 else
 	# This is totally wrong, works only with some old-style setups, and
 	# on some architectures of Debian/new FHS multiarch -- excluding, for
@@ -943,7 +943,7 @@ else
   SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
     {\
       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
+      for dir in ${dejavu_fonts}/share/fonts;\
       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_PROPORTIONAL_FONT))
@@ -968,7 +968,7 @@ else
   SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
     {\
       fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
-      for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
+      for dir in ${dejavu_fonts}/share/fonts;\
       do [ -d $$dir ] && echo $$dir; done;\
     } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
   ifneq (,$(SYS_MONOSPACED_FONT))