diff --git a/library/alignment.h b/library/alignment.h
index 986fdaa95c..de1ab91487 100644
--- a/library/alignment.h
+++ b/library/alignment.h
@@ -26,10 +26,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
-     !defined(inline) && !defined(__cplusplus)
-#define inline __inline
-#endif
+#include "mbedtls/build_info.h"
 
 /**
  * Read the unsigned 32 bits integer from the given address, which need not
diff --git a/library/common.h b/library/common.h
index 97d180aefb..9d3b8fe933 100644
--- a/library/common.h
+++ b/library/common.h
@@ -30,11 +30,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
-     !defined(inline) && !defined(__cplusplus)
-#define inline __inline
-#endif
-
 /** Helper to define a function as static except when building invasive tests.
  *
  * If a function is only used inside its own source file and should be