diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp
index 4ff55946..7682c5a7 100644
--- a/include/armadillo_bits/compiler_setup.hpp
+++ b/include/armadillo_bits/compiler_setup.hpp
@@ -180,16 +180,16 @@
   #undef  arma_inline
   #undef  arma_noinline
   
-  #define arma_hot                __attribute__((__hot__))
-  #define arma_cold               __attribute__((__cold__))
-  #define arma_aligned            __attribute__((__aligned__))
-  #define arma_align_mem          __attribute__((__aligned__(16)))
-  #define arma_warn_unused        __attribute__((__warn_unused_result__))
-  #define arma_deprecated         __attribute__((__deprecated__))
-  #define arma_frown(msg)         __attribute__((__deprecated__(msg)))
-  #define arma_malloc             __attribute__((__malloc__))
-  #define arma_inline      inline __attribute__((__always_inline__))
-  #define arma_noinline           __attribute__((__noinline__))
+  #define arma_hot         __attribute__((__hot__))
+  #define arma_cold        __attribute__((__cold__))
+  #define arma_aligned     __attribute__((__aligned__))
+  #define arma_align_mem   __attribute__((__aligned__(16)))
+  #define arma_warn_unused __attribute__((__warn_unused_result__))
+  #define arma_deprecated  __attribute__((__deprecated__))
+  #define arma_frown(msg)  __attribute__((__deprecated__(msg)))
+  #define arma_malloc      __attribute__((__malloc__))
+  #define arma_inline      __attribute__((__always_inline__)) inline
+  #define arma_noinline    __attribute__((__noinline__))
   
   #undef  ARMA_HAVE_ALIGNED_ATTRIBUTE
   #define ARMA_HAVE_ALIGNED_ATTRIBUTE
@@ -262,7 +262,7 @@
   
   #if __has_attribute(__always_inline__)
     #undef  arma_inline
-    #define arma_inline inline __attribute__((__always_inline__))
+    #define arma_inline __attribute__((__always_inline__)) inline
   #endif
   
   #if __has_attribute(__noinline__)
@@ -317,7 +317,7 @@
   #undef  arma_deprecated
   #define arma_deprecated __declspec(deprecated)
   // #undef  arma_inline
-  // #define arma_inline inline __forceinline
+  // #define arma_inline __forceinline inline
   
   #pragma warning(push)
   
diff --git a/include/armadillo_bits/debug.hpp b/include/armadillo_bits/debug.hpp
index fdaa9bbe..4a0bdedc 100644
--- a/include/armadillo_bits/debug.hpp
+++ b/include/armadillo_bits/debug.hpp
@@ -567,8 +567,8 @@ arma_incompat_size_string(const subview_cube<eT>& Q, const Mat<eT>& A, const cha
 
 
 
-arma_inline
 arma_hot
+arma_inline
 void
 arma_assert_same_size(const uword A_n_rows, const uword A_n_cols, const uword B_n_rows, const uword B_n_cols, const char* x)
   {
diff --git a/include/armadillo_bits/fft_engine_kissfft.hpp b/include/armadillo_bits/fft_engine_kissfft.hpp
index bfd0db3d..0c8c40c0 100644
--- a/include/armadillo_bits/fft_engine_kissfft.hpp
+++ b/include/armadillo_bits/fft_engine_kissfft.hpp
@@ -242,8 +242,8 @@ class fft_engine_kissfft
   
   
   
-  inline
   arma_hot
+  inline
   void
   butterfly_5(cx_type* Y, const uword stride, const uword m) const
     {
diff --git a/include/armadillo_bits/memory.hpp b/include/armadillo_bits/memory.hpp
index a85c503a..7be460f5 100644
--- a/include/armadillo_bits/memory.hpp
+++ b/include/armadillo_bits/memory.hpp
@@ -24,7 +24,7 @@ class memory
   {
   public:
   
-  template<typename eT> inline arma_malloc static eT* acquire(const uword n_elem);
+  template<typename eT> arma_malloc inline static eT* acquire(const uword n_elem);
   
   template<typename eT> arma_inline static void release(eT* mem);
   
@@ -36,8 +36,8 @@ class memory
 
 
 template<typename eT>
-inline
 arma_malloc
+inline
 eT*
 memory::acquire(const uword n_elem)
   {
diff --git a/include/armadillo_bits/mul_herk.hpp b/include/armadillo_bits/mul_herk.hpp
index ab9ec76a..e6b13b2b 100644
--- a/include/armadillo_bits/mul_herk.hpp
+++ b/include/armadillo_bits/mul_herk.hpp
@@ -48,9 +48,9 @@ class herk_helper
   
   
   template<typename eT>
-  static
   arma_hot
   inline
+  static
   eT
   dot_conj_row(const uword n_elem, const eT* const A, const Mat<eT>& B, const uword row)
     {