diff --git a/Xext/security.c b/Xext/security.c
index 162d07ae0..97af836ab 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -147,7 +147,7 @@ SecurityLabelInitial(void)
 /*
  * Looks up a request name
  */
-static _X_INLINE const char *
+static inline const char *
 SecurityLookupRequestName(ClientPtr client)
 {
     return LookupRequestName(client->majorOp, client->minorOp);
diff --git a/dix/region.c b/dix/region.c
index 49d823cda..5c83f8a04 100644
--- a/dix/region.c
+++ b/dix/region.c
@@ -402,7 +402,7 @@ RegionRectAlloc(RegionPtr pRgn, int n)
  *
  *-----------------------------------------------------------------------
  */
-_X_INLINE static int
+static inline int
 RegionCoalesce(RegionPtr pReg,  /* Region to coalesce                */
                int prevStart,   /* Index of start of previous band   */
                int curStart)
@@ -487,7 +487,7 @@ RegionCoalesce(RegionPtr pReg,  /* Region to coalesce                */
  *-----------------------------------------------------------------------
  */
 
-_X_INLINE static Bool
+static inline Bool
 RegionAppendNonO(RegionPtr pReg, BoxPtr r, BoxPtr rEnd, int y1, int y2)
 {
     BoxPtr pNextRect;
diff --git a/dix/resource.c b/dix/resource.c
index b8c4d1d7e..53c4fcfba 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -493,7 +493,7 @@ static const struct ResourceType predefTypes[] = {
 
 CallbackListPtr ResourceStateCallback;
 
-static _X_INLINE void
+static inline void
 CallResourceStateCallback(ResourceState state, ResourceRec * res)
 {
     if (ResourceStateCallback) {
diff --git a/dix/selection.c b/dix/selection.c
index d46103f70..088924e2e 100644
--- a/dix/selection.c
+++ b/dix/selection.c
@@ -101,7 +101,7 @@ InitSelections(void)
     CurrentSelections = NULL;
 }
 
-static _X_INLINE void
+static inline void
 CallSelectionCallback(Selection * pSel, ClientPtr client,
                       SelectionCallbackKind kind)
 {
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index a6a60e50c..a9460f999 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -33,7 +33,7 @@
 
 /* This file holds the classic exa specific implementation. */
 
-static _X_INLINE void *
+static inline void *
 ExaGetPixmapAddress(PixmapPtr p)
 {
     ExaPixmapPriv(p);
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index 45acf152c..7a74c4500 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -33,7 +33,7 @@
 
 /* This file holds the driver allocated pixmaps specific implementation. */
 
-static _X_INLINE void *
+static inline void *
 ExaGetPixmapAddress(PixmapPtr p)
 {
     ExaPixmapPriv(p);
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index d926f8033..4c7714657 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -34,7 +34,7 @@
 /* This file holds the driver allocated pixmaps + better initial placement code.
  */
 
-static _X_INLINE void *
+static inline void *
 ExaGetPixmapAddress(PixmapPtr p)
 {
     ExaPixmapPriv(p);
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 4468487e6..02a4e32fd 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -452,7 +452,7 @@ ExaCheckAddTraps(PicturePtr pPicture,
 
 /* exa_accel.c */
 
-static _X_INLINE Bool
+static inline Bool
 exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask,
                       unsigned int fillStyle, unsigned char alu,
                       Bool clientClip)