diff --git a/Makefile b/Makefile
index c74c29ee9d0..31503b6fb01 100644
--- a/Makefile
+++ b/Makefile
@@ -373,6 +373,7 @@ ZEPHYRINCLUDE    = \
 		-I$(srctree)/kernel/include \
 		-I$(srctree)/arch/$(ARCH)/include \
 		-I$(srctree)/arch/$(ARCH)/soc/$(SOC_PATH) \
+		-I$(srctree)/arch/$(ARCH)/soc/$(SOC_FAMILY)/include \
 		-I$(srctree)/boards/$(ARCH)/$(BOARD_NAME) \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
 		-I$(srctree)/include \
diff --git a/drivers/pinmux/pinmux_quark_mcu.h b/arch/x86/soc/intel_quark/include/pinmux_quark_mcu.h
similarity index 100%
rename from drivers/pinmux/pinmux_quark_mcu.h
rename to arch/x86/soc/intel_quark/include/pinmux_quark_mcu.h
diff --git a/boards/arm/v2m_beetle/Makefile b/boards/arm/v2m_beetle/Makefile
index 29b19c20433..cc98dc3191b 100644
--- a/boards/arm/v2m_beetle/Makefile
+++ b/boards/arm/v2m_beetle/Makefile
@@ -6,6 +6,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Trick the build system into generating built-in.o even though there
-# are no C files (yet) to compile
-obj- += dummy.o
+obj- += pinmux.o
diff --git a/drivers/pinmux/beetle/pinmux_board_v2m_beetle.c b/boards/arm/v2m_beetle/pinmux.c
similarity index 100%
rename from drivers/pinmux/beetle/pinmux_board_v2m_beetle.c
rename to boards/arm/v2m_beetle/pinmux.c
diff --git a/boards/x86/arduino_101/pinmux.c b/boards/x86/arduino_101/pinmux.c
index 3e5dd2b00ad..a9968c1e9a4 100644
--- a/boards/x86/arduino_101/pinmux.c
+++ b/boards/x86/arduino_101/pinmux.c
@@ -13,7 +13,7 @@
 #include <sys_io.h>
 #include "pinmux/pinmux.h"
 
-#include "pinmux_quark_mcu.h"
+#include <pinmux_quark_mcu.h>
 
 /*
  * This is the full pinmap that we have available on the board for configuration
diff --git a/boards/x86/quark_se_c1000_devboard/pinmux.c b/boards/x86/quark_se_c1000_devboard/pinmux.c
index 70b4bef5c46..462eb5cd554 100644
--- a/boards/x86/quark_se_c1000_devboard/pinmux.c
+++ b/boards/x86/quark_se_c1000_devboard/pinmux.c
@@ -14,7 +14,7 @@
 #include <sys_io.h>
 #include "pinmux/pinmux.h"
 
-#include "pinmux_quark_mcu.h"
+#include <pinmux_quark_mcu.h>
 
 /*
  * This is the full pinmap that we have available on the board for configuration
diff --git a/drivers/pinmux/Makefile b/drivers/pinmux/Makefile
index b0bf422208f..a031c6eb66d 100644
--- a/drivers/pinmux/Makefile
+++ b/drivers/pinmux/Makefile
@@ -5,7 +5,6 @@ ccflags-$(CONFIG_PINMUX_QMSI) += -I$(CONFIG_QMSI_INSTALL_PATH)/include
 # Board initialization
 obj-$(CONFIG_PINMUX_MCUX) += pinmux_mcux.o
 obj-$(CONFIG_PINMUX_STM32) += stm32/pinmux_stm32.o
-obj-$(CONFIG_PINMUX_BEETLE) += beetle/pinmux_board_v2m_beetle.o
 obj-$(CONFIG_PINMUX_QMSI) += pinmux_qmsi.o
 obj-$(CONFIG_PINMUX_FE310) += pinmux_fe310.o
 obj-$(CONFIG_PINMUX_CC2650) += pinmux_cc2650.o
diff --git a/drivers/pinmux/dummy.c b/drivers/pinmux/dummy.c
new file mode 100644
index 00000000000..e69de29bb2d