diff --git a/src/ReDIVA/app.cpp b/src/ReDIVA/app.cpp
index f77e5b56..9130287a 100644
--- a/src/ReDIVA/app.cpp
+++ b/src/ReDIVA/app.cpp
@@ -95,6 +95,17 @@
 #include <timeapi.h>
 #include <Volk/volk.h>
 
+#ifndef USE_OPENGL
+#if BAKE_PNG
+#undef BAKE_PNG
+#define BAKE_PNG (0)
+#endif
+#if BAKE_VIDEO
+#undef BAKE_VIDEO
+#define BAKE_VIDEO (0)
+#endif
+#endif
+
 #ifdef DEBUG
 #define RENDER_DEBUG 1
 #else
diff --git a/src/ReDIVA/config.hpp b/src/ReDIVA/config.hpp
index 29d8dff9..149076ff 100644
--- a/src/ReDIVA/config.hpp
+++ b/src/ReDIVA/config.hpp
@@ -29,14 +29,3 @@
 #undef BAKE_PNG
 #elif BAKE_PNG
 #endif
-
-#ifndef USE_OPENGL
-#if BAKE_PNG
-#undef BAKE_PNG
-#define BAKE_PNG (0)
-#endif
-#if BAKE_VIDEO
-#undef BAKE_VIDEO
-#define BAKE_VIDEO (0)
-#endif
-#endif
diff --git a/src/ReDIVA/input_state.cpp b/src/ReDIVA/input_state.cpp
index 6bb62075..b0c82ad9 100644
--- a/src/ReDIVA/input_state.cpp
+++ b/src/ReDIVA/input_state.cpp
@@ -8,6 +8,17 @@
 #include "config.hpp"
 #include "input.hpp"
 
+#ifndef USE_OPENGL
+#if BAKE_PNG
+#undef BAKE_PNG
+#define BAKE_PNG (0)
+#endif
+#if BAKE_VIDEO
+#undef BAKE_VIDEO
+#define BAKE_VIDEO (0)
+#endif
+#endif
+
 /*
 Bit / Name
   0   JVS_TEST
diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp
index 9905df26..0417f13c 100644
--- a/src/ReDIVA/x_pv_game.cpp
+++ b/src/ReDIVA/x_pv_game.cpp
@@ -30,6 +30,18 @@
 #include "../KKdLib/msgpack.hpp"
 #include "../KKdLib/sort.hpp"
 #include "../KKdLib/str_utils.hpp"
+
+#ifndef USE_OPENGL
+#if BAKE_PNG
+#undef BAKE_PNG
+#define BAKE_PNG (0)
+#endif
+#if BAKE_VIDEO
+#undef BAKE_VIDEO
+#define BAKE_VIDEO (0)
+#endif
+#endif
+
 #if BAKE_X_PACK
 #include "../KKdLib/waitable_timer.hpp"
 #endif