diff --git a/include/linker/linker-defs.h b/include/linker/linker-defs.h
index b5f177cf12c..c915139e0c8 100644
--- a/include/linker/linker-defs.h
+++ b/include/linker/linker-defs.h
@@ -22,6 +22,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <misc/util.h>
+#include <offsets.h>
 
 /* include platform dependent linker-defs */
 #ifdef CONFIG_X86
@@ -52,7 +53,7 @@
  */
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 #define DEVICE_COUNT \
-	((__device_init_end - __device_init_start) / _DEVICE_STRUCT_SIZE)
+	((__device_init_end - __device_init_start) / _DEVICE_STRUCT_SIZEOF)
 #define DEV_BUSY_SZ	(((DEVICE_COUNT + 31) / 32) * 4)
 #define DEVICE_BUSY_BITFIELD()			\
 		FILL(0x00) ;			\
diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
index d129f7d4be5..7a35c956724 100644
--- a/kernel/include/kernel_offsets.h
+++ b/kernel/include/kernel_offsets.h
@@ -78,6 +78,6 @@ GEN_OFFSET_SYM(_thread_t, custom_data);
 GEN_ABSOLUTE_SYM(K_THREAD_SIZEOF, sizeof(struct k_thread));
 
 /* size of the device structure. Used by linker scripts */
-GEN_ABSOLUTE_SYM(_DEVICE_STRUCT_SIZE, sizeof(struct device));
+GEN_ABSOLUTE_SYM(_DEVICE_STRUCT_SIZEOF, sizeof(struct device));
 
 #endif /* ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_ */
diff --git a/tests/ztest/include/offsets.h b/tests/ztest/include/offsets.h
new file mode 100644
index 00000000000..2cfaadd2d85
--- /dev/null
+++ b/tests/ztest/include/offsets.h
@@ -0,0 +1,14 @@
+#ifndef __GEN_OFFSETS_H__
+#define __GEN_OFFSETS_H__
+
+/*
+ * This file is a fake replacement for
+ * $build_dir/zephyr/include/generated/offsets.h
+ *
+ * The unittest infrastructure does not know how to generate
+ * offsets.h, so until this is supported we fake it with this
+ * file. This allows us to test source files that include offsets.h,
+ * but don't actually use anything from it when unit testing.
+ */
+
+#endif