diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index aa08882b1076..c8378dc97a41 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common_source
+.PATH: ${.CURDIR:H}/common_source
 
 PROG=	chkprintcap
 MAN=	chkprintcap.8
 SRCS=	chkprintcap.c skimprintcap.c
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 LIBADD=	lpr
 
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 71ffc09eb3ff..564867d2be7c 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -3,6 +3,6 @@
 PROG=	koi2855
 MAN=
 
-CFLAGS+= -I${.CURDIR}/../../common_source
+CFLAGS+= -I${.CURDIR:H:H}/common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index 98f7ffe13e2c..4e2f7853ddab 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -3,6 +3,6 @@
 PROG=	koi2alt
 MAN=
 
-CFLAGS+= -I${.CURDIR}/../../common_source
+CFLAGS+= -I${.CURDIR:H:H}/common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index 7976752d0df0..a984e78980d0 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -6,6 +6,6 @@ BINDIR=	${LIBEXECDIR}/lpr
 PROG=	lpf
 MAN=
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 43f1f7a71f6b..ab972a5c888b 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common_source
+.PATH: ${.CURDIR:H}/common_source
 
 PROG=	lpc
 MAN=	lpc.8
@@ -9,7 +9,7 @@ SRCS=	lpc.c cmds.c cmdtab.c movejobs.c
 BINGRP=	daemon
 BINMODE= 2555
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 WARNS?=	0
 
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index a35212bb2cc8..af2582c4bb1c 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -5,7 +5,7 @@ PROG=	lpd
 MAN=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c lpdchar.c modes.c
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 WARNS?=	1
 
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 7ea22fa4cd4d..3ce7182480f0 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -8,7 +8,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE= 6555
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 LIBADD=	lpr
 
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 2841a79290eb..a25bb87f2f44 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common_source
+.PATH: ${.CURDIR:H}/common_source
 
 BINDIR=	/usr/bin
 
@@ -11,7 +11,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE= 6555
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 WARNS?=	2
 
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 5724d53280e3..8e882c3f8c1b 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common_source
+.PATH: ${.CURDIR:H}/common_source
 
 BINDIR=	/usr/bin
 
@@ -10,7 +10,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE= 6555
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 LIBADD=	lpr
 
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 65b1c7c8fef8..18083e529d3b 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -3,6 +3,6 @@
 
 PROG=	lptest
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index faf8e581c3b9..81ffc5c96c21 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,12 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common_source
+.PATH: ${.CURDIR:H}/common_source
 
 PROG=	pac
 MAN=	pac.8
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 LIBADD=	lpr