diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h
index 3667541a39..8622521742 100644
--- a/headers/private/fs_shell/fssh_api_wrapper.h
+++ b/headers/private/fs_shell/fssh_api_wrapper.h
@@ -173,6 +173,8 @@
 
 #undef	offsetof
 #define offsetof(type,member)	fssh_offsetof(type,member)
+#undef	alignof
+#define alignof(type)	fssh_alignof(type)
 
 #define min_c(a,b)				fssh_min_c(a,b)
 #define max_c(a,b)				fssh_max_c(a,b)
diff --git a/headers/private/fs_shell/fssh_defs.h b/headers/private/fs_shell/fssh_defs.h
index f57573d257..5bba3e0af1 100644
--- a/headers/private/fs_shell/fssh_defs.h
+++ b/headers/private/fs_shell/fssh_defs.h
@@ -49,6 +49,8 @@ enum fssh_node_flavor {
 #define fssh_offsetof(type,member) ((size_t)&((type*)0)->member)
 #endif
 
+#define fssh_alignof(type)   __alignof__(type)
+
 #define fssh_min_c(a,b) ((a)>(b)?(b):(a))
 #define fssh_max_c(a,b) ((a)>(b)?(a):(b))