diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a49a5c006d7..4a84e8e5659 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -94,7 +94,7 @@ options 	RCTL			# Resource limits
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
index 85ff32ea329..1939b0efd35 100644
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index c413590586e..3447cbc366f 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -79,7 +79,7 @@ options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
diff --git a/sys/amd64/conf/MINIMAL-NODEBUG b/sys/amd64/conf/MINIMAL-NODEBUG
index 35281b2212d..7b7c22bbcaf 100644
--- a/sys/amd64/conf/MINIMAL-NODEBUG
+++ b/sys/amd64/conf/MINIMAL-NODEBUG
@@ -6,6 +6,6 @@
 #NO_UNIVERSE
 
 include MINIMAL
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   MINIMAL-NODEBUG
diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
index 58f78036470..0b319924518 100644
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index 9ae37eab90d..a24227fc838 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -66,7 +66,7 @@ options 	KDB_TRACE		# Print a stack trace for a panic.
 options		USB_DEBUG		# Enable usb debug support code
 
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Optional extras, never enabled by default:
 #options 	BOOTVERBOSE
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
index 72f22efd0c2..4ef60c33121 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -66,7 +66,7 @@ options 	KDB_TRACE		# Print a stack trace for a panic.
 options		USB_DEBUG		# Enable usb debug support code
 
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Optional extras, never enabled by default:
 #options 	BOOTVERBOSE
diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
index 6a475c8c632..b2e86512901 100644
--- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
+++ b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG
@@ -9,6 +9,6 @@
 #NO_UNIVERSE
 
 include GENERIC-MMCCAM
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident GENERIC-MMCCAM-NODEBUG
diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
index a0dbb030c10..086942dfaab 100644
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index cb3c591947f..cc4a5acbb31 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -73,7 +73,7 @@ options 	PERTHREAD_SSP		# Per-thread SSP canary
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel Sanitizers
 #options 	COVERAGE		# Generic kernel coverage. Used by KCOV
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7bd01d4e60e..b32986e1376 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -88,7 +88,7 @@ options 	RCTL			# Resource limits
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
index 64b9ecb8a33..ea07613a796 100644
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index b29a179d2bd..c70fd27a5c6 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -87,7 +87,7 @@ options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
diff --git a/sys/i386/conf/MINIMAL-NODEBUG b/sys/i386/conf/MINIMAL-NODEBUG
index 35281b2212d..7b7c22bbcaf 100644
--- a/sys/i386/conf/MINIMAL-NODEBUG
+++ b/sys/i386/conf/MINIMAL-NODEBUG
@@ -6,6 +6,6 @@
 #NO_UNIVERSE
 
 include MINIMAL
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   MINIMAL-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index bb7865301fc..6083b4d2bac 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -91,7 +91,7 @@ options 	RCTL			# Resource limits
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
index 9d069a41acc..0761376a816 100644
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index b077cf3f2fe..26b308a4e06 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -101,7 +101,7 @@ options 	RCTL			# Resource limits
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG
index 2659899940e..a4c3dbd856e 100644
--- a/sys/powerpc/conf/GENERIC64-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC64
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC64-NODEBUG
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index f090cd47ecf..84c27690211 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -97,7 +97,7 @@ options 	RCTL			# Resource limits
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-include ../../conf/std.debug
+include "std.debug"
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG
index ab48bf7a054..fd2d3ca84a1 100644
--- a/sys/powerpc/conf/GENERIC64LE-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64LE-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC64LE
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC64LE-NODEBUG
diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG
index ca4d07fbd2d..e4f4b41f2c4 100644
--- a/sys/riscv/conf/GENERIC-NODEBUG
+++ b/sys/riscv/conf/GENERIC-NODEBUG
@@ -26,6 +26,6 @@
 #
 
 include GENERIC
-include "../../conf/std.nodebug"
+include "std.nodebug"
 
 ident   GENERIC-NODEBUG