diff --git a/src/crt/ulong_extras.h b/src/crt/ulong_extras.h
index 64e4d398..c86f3da2 100644
--- a/src/crt/ulong_extras.h
+++ b/src/crt/ulong_extras.h
@@ -18,7 +18,7 @@
 #ifdef ULONG_EXTRAS_INLINES_C
 #define ULONG_EXTRAS_INLINE FLINT_DLL
 #else
-#define ULONG_EXTRAS_INLINE static __inline__
+#define ULONG_EXTRAS_INLINE static inline
 #endif
 
 #include <gmp.h>
@@ -32,13 +32,13 @@
 
 #define UWORD_HALF (UWORD_MAX / 2 + 1)
 
-static __inline__
+static inline
 double n_precompute_inverse(ulong n)
 {
    return (double) 1 / (double) n;
 }
 
-static __inline__
+static inline
 ulong n_preinvert_limb(ulong n)
 {
    ulong norm, ninv;
@@ -53,7 +53,7 @@ ulong n_preinvert_limb(ulong n)
 /*                       ulong n, ulong ninv); */
 #include "ulong_extras/ll_mod_preinv.c"
 
-static __inline__ 
+static inline 
 ulong n_mulmod2_preinv(ulong a, ulong b, ulong n, ulong ninv)
 {
     ulong p1, p2;
@@ -64,7 +64,7 @@ ulong n_mulmod2_preinv(ulong a, ulong b, ulong n, ulong ninv)
     return n_ll_mod_preinv(p1, p2, n, ninv);
 }
 
-static __inline__ 
+static inline 
 ulong n_mulmod2(ulong a, ulong b, ulong n)
 {
     ulong p1, p2, ninv;
@@ -76,7 +76,7 @@ ulong n_mulmod2(ulong a, ulong b, ulong n)
     return n_ll_mod_preinv(p1, p2, n, ninv);
 }
 
-static __inline__ 
+static inline 
 ulong n_addmod(ulong x, ulong y, ulong n)
 {
     /* FLINT_ASSERT(x < n); */
@@ -86,7 +86,7 @@ ulong n_addmod(ulong x, ulong y, ulong n)
     return (n - y > x ? x + y : x + y - n);
 }
 
-static __inline__
+static inline
 ulong n_submod(ulong x, ulong y, ulong n)
 {
     /* FLINT_ASSERT(x < n); */
@@ -96,7 +96,7 @@ ulong n_submod(ulong x, ulong y, ulong n)
 }
 
 
-static __inline__
+static inline
 ulong n_negmod(ulong x, ulong n)
 {
     /* FLINT_ASSERT(x < n); */
@@ -106,10 +106,10 @@ ulong n_negmod(ulong x, ulong n)
 }
 
 
-/* static __inline__ ulong n_gcdinv(ulong * a, ulong x, ulong y); */
+/* static inline ulong n_gcdinv(ulong * a, ulong x, ulong y); */
 #include "ulong_extras/gcdinv.c"
 
-static __inline__
+static inline
 ulong n_invmod(ulong x, ulong y)
 {
    ulong r, g;
diff --git a/src/fglm/matrix-mult.c b/src/fglm/matrix-mult.c
index 20c1faa4..e5d47d98 100644
--- a/src/fglm/matrix-mult.c
+++ b/src/fglm/matrix-mult.c
@@ -148,7 +148,7 @@ static inline void REDUCE(uint64_t *acc64, uint64_t *acc4x64,
 /* stores in tmp the entries of B column-wise */
 /* tmp = [ B[0][0], B[1][0], ..., B[n][0],
            B[0][1], ..., B[n][1], ... ] */
-static __inline__ void specialize_tmp(uint32_t *tmp,
+static inline void specialize_tmp(uint32_t *tmp,
                                       uint32_t ** B,
                                       const long l, const long n){
   for(long i = 0; i < l; i++){
@@ -157,7 +157,7 @@ static __inline__ void specialize_tmp(uint32_t *tmp,
   }
 }
 
-static __inline__ void make_zero(uint32_t ** D,
+static inline void make_zero(uint32_t ** D,
                                 long m, long n){
   for(long i = 0; i < m; i++){
     for(long j = 0; j < n; j++){