diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h b/components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
index 1c855d7523..8dbb4a9545 100644
--- a/components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
+++ b/components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
@@ -301,7 +301,11 @@ typedef enum {
     S2LP_STATE_SYNTH_SETUP  = 0x50
 } s2lp_states_e;
 
+#if defined __cplusplus && __cplusplus >= 201103
+typedef enum : uint8_t {
+#else
 typedef enum {
+#endif
     S2LP_CMD_TX = 0x60,
     S2LP_CMD_RX,
     S2LP_CMD_READY,
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h b/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h
index f9b7815b26..f19382a67e 100644
--- a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h
+++ b/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h
@@ -121,7 +121,15 @@ typedef int_fast32_t int_fast24_t;
 #define alignas(n) __align(n)
 #define __alignas_is_defined 1
 #elif (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) || (defined __cplusplus && __cplusplus >= 201103L)
-#include <stdalign.h>
+# if defined __ARMCC_VERSION && __ARMCC_VERSION < 6120000
+    /* Workaround for Arm Compiler versions prior to 6.12 */
+#   if !defined __cplusplus
+#     define alignas _Alignas
+#   endif
+#   define __alignas_is_defined 1
+# else
+#   include <stdalign.h>
+# endif
 #elif defined __GNUC__
 #define alignas(n) __attribute__((__aligned__(n)))
 #define __alignas_is_defined 1