diff --git a/arch/arm/include/nano_private.h b/arch/arm/include/nano_private.h
index 649313682e6..1607c797e47 100644
--- a/arch/arm/include/nano_private.h
+++ b/arch/arm/include/nano_private.h
@@ -168,6 +168,9 @@ struct tcs_base {
 	uint32_t     flags;
 	int          prio;
 	void        *swap_data;
+#ifdef CONFIG_NANO_TIMEOUTS
+	struct _timeout timeout;
+#endif
 };
 #endif
 
@@ -177,6 +180,9 @@ struct tcs {
 	uint32_t    flags;
 	int         prio;
 	void       *swap_data;
+#ifdef CONFIG_NANO_TIMEOUTS
+	struct _timeout timeout;
+#endif
 #else
 	struct tcs *link; /* singly-linked list in _nanokernel.fibers */
 	uint32_t flags;
@@ -204,9 +210,6 @@ struct tcs {
 #endif
 #endif
 #ifdef CONFIG_KERNEL_V2
-#ifdef CONFIG_NANO_TIMEOUTS
-	struct _timeout timeout;
-#endif
 	atomic_t sched_locked;
 	void *init_data;
 	void (*fn_abort)(void);
diff --git a/arch/x86/include/nano_private.h b/arch/x86/include/nano_private.h
index 4e48c5e288b..68a8af49b8b 100644
--- a/arch/x86/include/nano_private.h
+++ b/arch/x86/include/nano_private.h
@@ -640,6 +640,9 @@ struct tcs_base {
 	uint32_t     flags;
 	int          prio;     /* thread priority used to sort linked list */
 	void        *swap_data;
+#ifdef CONFIG_NANO_TIMEOUTS
+	struct _timeout timeout;
+#endif
 };
 #endif
 
@@ -662,6 +665,9 @@ struct tcs {
 	int         flags;
 	int         prio;     /* thread priority used to sort linked list */
 	void       *swap_data;
+#ifdef CONFIG_NANO_TIMEOUTS
+	struct _timeout timeout;
+#endif
 #else
 	struct tcs *link;
 
@@ -722,9 +728,6 @@ struct tcs {
 #endif
 
 #ifdef CONFIG_KERNEL_V2
-#ifdef CONFIG_NANO_TIMEOUTS
-	struct _timeout timeout;
-#endif
 	atomic_t sched_locked;
 	void *init_data;
 	void (*fn_abort)(void);