diff --git a/source/creator/creator.cc b/source/creator/creator.cc
index 8466247fff6..a5c7760525d 100644
--- a/source/creator/creator.cc
+++ b/source/creator/creator.cc
@@ -72,7 +72,9 @@
 
 #include "RNA_define.hh"
 
-#include "GPU_compilation_subprocess.hh"
+#ifdef WITH_OPENGL_BACKEND
+#  include "GPU_compilation_subprocess.hh"
+#endif
 
 #ifdef WITH_FREESTYLE
 #  include "FRS_freestyle.h"
@@ -94,9 +96,7 @@
 
 #ifdef WITH_LIBMV
 #  include "libmv-capi.h"
-#endif
-
-#ifdef WITH_CYCLES_LOGGING
+#elif defined(WITH_CYCLES_LOGGING)
 #  include "CCL_api.h"
 #endif
 
diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc
index 7bf81d97056..867d69f32da 100644
--- a/source/creator/creator_args.cc
+++ b/source/creator/creator_args.cc
@@ -48,8 +48,11 @@
 #  include "BKE_scene.hh"
 #  include "BKE_sound.h"
 
-#  include "GPU_capabilities.hh"
 #  include "GPU_context.hh"
+#  ifdef WITH_OPENGL_BACKEND
+#    include "GPU_capabilities.hh"
+#    include "GPU_compilation_subprocess.hh"
+#  endif
 
 #  ifdef WITH_PYTHON
 #    include "BPY_extern_python.hh"
@@ -2434,7 +2437,7 @@ static int arg_handle_python_console_run(int /*argc*/, const char ** /*argv*/, v
 
   return 0;
 #  else
-  UNUSED_VARS(argv, data);
+  UNUSED_VARS(data);
   fprintf(stderr, "This Blender was built without python support\n");
   return 0;
 #  endif /* WITH_PYTHON */