diff --git a/debian/build/Makefile b/debian/build/Makefile
index 532714e33..970d4e4c7 100644
--- a/debian/build/Makefile
+++ b/debian/build/Makefile
@@ -8,6 +8,4 @@ SUBDIRS = \
 
 OUTDIR = .
 
-top_srcdir = .
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include Makefile.inc
diff --git a/debian/build/Makefile.inc b/debian/build/Makefile.inc
index 72658a42f..22966b838 100644
--- a/debian/build/Makefile.inc
+++ b/debian/build/Makefile.inc
@@ -1,8 +1,13 @@
+top_srcdir = $(dir $(lastword $(MAKEFILE_LIST)))/../..
+
+VPATH = $(top_srcdir)/$(OUTDIR)
+
 SHELL = /bin/sh -e
 
 CC = gcc
 CXX = g++
 CFLAGS ?= -O2 -Wall
+CPPFLAGS = -I$(top_srcdir)/$(OUTDIR) -I$(top_srcdir)/debian/build/$(OUTDIR)
 CXXFLAGS = $(CFLAGS)
 
 all: all-local all-recursive
diff --git a/debian/build/scripts/Makefile b/debian/build/scripts/Makefile
index d591c9bcc..13f2e7a56 100644
--- a/debian/build/scripts/Makefile
+++ b/debian/build/scripts/Makefile
@@ -43,8 +43,4 @@ SUBDIRS = \
 
 OUTDIR = scripts
 
-top_srcdir = ..
-
-VPATH = $(top_srcdir)/scripts
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ..//Makefile.inc
diff --git a/debian/build/scripts/basic/Makefile b/debian/build/scripts/basic/Makefile
index 7a5ef1c80..0ae6a26a8 100644
--- a/debian/build/scripts/basic/Makefile
+++ b/debian/build/scripts/basic/Makefile
@@ -3,8 +3,4 @@ PROGS = \
 
 OUTDIR = scripts/basic
 
-top_srcdir = ../..
-
-VPATH = $(top_srcdir)/$(OUTDIR)
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ../../Makefile.inc
diff --git a/debian/build/scripts/genksyms/Makefile b/debian/build/scripts/genksyms/Makefile
index 66f5b2d4f..fc26e0c54 100644
--- a/debian/build/scripts/genksyms/Makefile
+++ b/debian/build/scripts/genksyms/Makefile
@@ -2,17 +2,11 @@ PROGS = genksyms
 
 OUTDIR = scripts/genksyms
 
-top_srcdir = ../..
+include ../../Makefile.inc
 
-VPATH = $(top_srcdir)/$(OUTDIR)
+genksyms: genksyms.o parse.tab.o lex.lex.o
 
-include $(top_srcdir)/debian/build/Makefile.inc
-
-CFLAGS += -I$(VPATH)
-
-genksyms: genksyms.o parse.o lex.o
-
-lex.o: keywords.c parse.h
+lex.lex.o: keywords.hash.c parse.tab.h
 
 %.c: %.c_shipped
 	ln -s $< $@
@@ -21,4 +15,4 @@ lex.o: keywords.c parse.h
 	ln -s $< $@
 
 clean:
-	rm -f keywords.c parse.h
+	rm -f keywords.hash.c parse.tab.c parse.tab.h
diff --git a/debian/build/scripts/kconfig/Makefile b/debian/build/scripts/kconfig/Makefile
index 370db47ab..201ab58bb 100644
--- a/debian/build/scripts/kconfig/Makefile
+++ b/debian/build/scripts/kconfig/Makefile
@@ -2,17 +2,11 @@ PROGS = conf
 
 OUTDIR = scripts/kconfig
 
-top_srcdir = ../..
-
-VPATH = $(top_srcdir)/$(OUTDIR)
-
-include $(top_srcdir)/debian/build/Makefile.inc
-
-CFLAGS += -I$(VPATH)
+include ../../Makefile.inc
 
 conf: conf.o zconf.tab.o
 
-zconf.tab.c: zconf.hash.c lex.zconf.c
+zconf.tab.c: zconf.hash.c zconf.lex.c
 
 %.c: %.c_shipped
 	ln -sf $< $@
@@ -21,4 +15,4 @@ zconf.tab.c: zconf.hash.c lex.zconf.c
 	ln -sf $< $@
 
 clean:
-	rm -f zconf.tab.c zconf.hash.c lex.zconf.c
+	rm -f zconf.tab.c zconf.hash.c zconf.lex.c
diff --git a/debian/build/scripts/mod/Makefile b/debian/build/scripts/mod/Makefile
index 5cb67d4a8..fe5e90bb5 100644
--- a/debian/build/scripts/mod/Makefile
+++ b/debian/build/scripts/mod/Makefile
@@ -7,9 +7,7 @@ PROGS = \
 
 OUTDIR = scripts/mod
 
-top_srcdir = ../..
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ../../Makefile.inc
 
 modpost.real-%:
 	$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/scripts/mod