diff --git a/src/glx/create_context.c b/src/glx/create_context.c
index 6f6e2852030..eced2430b36 100644
--- a/src/glx/create_context.c
+++ b/src/glx/create_context.c
@@ -108,9 +108,11 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
                       (const uint32_t *) attrib_list,
                       &error);
    } else if (!direct) {
+#ifdef GLX_INDIRECT_RENDERING
       gc = indirect_create_context_attribs(psc, cfg, share, num_attribs,
                                            (const uint32_t *) attrib_list,
                                            &error);
+#endif
    }
 #endif
 
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index a1fb748303e..ec1de6929f0 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -321,8 +321,10 @@ CreateContext(Display *dpy, int generic_id, struct glx_config *config,
 #else
    if (allowDirect && psc->vtable->create_context)
       gc = psc->vtable->create_context(psc, config, shareList, renderType);
+#ifdef GLX_INDIRECT_RENDERING
    if (!gc)
       gc = indirect_create_context(psc, config, shareList, renderType);
+#endif
 #endif
    if (!gc)
       return NULL;
@@ -1318,7 +1320,9 @@ glXImportContextEXT(Display *dpy, GLXContextID contextID)
    if (mode == NULL)
       return NULL;
 
+#ifdef GLX_INDIRECT_RENDERING
    ctx = indirect_create_context(psc, mode, NULL, renderType);
+#endif
    if (ctx == NULL)
       return NULL;
 
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index fa2399c513b..9cc4fab9ce6 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -916,7 +916,9 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, enum glx_dr
 #else
       if (psc == NULL && !zink)
       {
+#ifdef GLX_INDIRECT_RENDERING
          psc = indirect_create_screen(i, priv);
+#endif
          indirect = true;
       }
 #endif