diff --git a/src/ReDIVA/data_test/auth_2d_test.cpp b/src/ReDIVA/data_test/auth_2d_test.cpp
index 0ea6bdb3..cf325262 100644
--- a/src/ReDIVA/data_test/auth_2d_test.cpp
+++ b/src/ReDIVA/data_test/auth_2d_test.cpp
@@ -43,9 +43,6 @@ public:
     static void TypeCallback(dw::Widget* data);
 };
 
-extern int32_t width;
-extern int32_t height;
-
 DtmAet* dtm_aet;
 DtwAet* dtw_aet;
 
diff --git a/src/ReDIVA/data_test/auth_3d_test.cpp b/src/ReDIVA/data_test/auth_3d_test.cpp
index 4786e2e5..1184a422 100644
--- a/src/ReDIVA/data_test/auth_3d_test.cpp
+++ b/src/ReDIVA/data_test/auth_3d_test.cpp
@@ -304,9 +304,6 @@ public:
     virtual void Callback(CallbackData* data) override;
 };
 
-extern int32_t width;
-extern int32_t height;
-extern float_t frame_speed;
 extern render_context* rctx_ptr;
 
 Auth3dTestTask* auth_3d_test_task;
diff --git a/src/ReDIVA/data_test/glitter_test.cpp b/src/ReDIVA/data_test/glitter_test.cpp
index 079fe42c..a9dc7c91 100644
--- a/src/ReDIVA/data_test/glitter_test.cpp
+++ b/src/ReDIVA/data_test/glitter_test.cpp
@@ -49,11 +49,7 @@ public:
 
 TaskDataTestGlitterParticle* task_data_test_glitter_particle;
 
-extern int32_t width;
-extern int32_t height;
 extern render_context* rctx_ptr;
-extern bool input_reset;
-extern bool input_locked;
 
 TaskDataTestGlitterParticle::TaskDataTestGlitterParticle() : hash(), dw(),
 frame(), auto_and_repeat(), reload(), pv_mode(), show_grid(), rebuild_geff() {
diff --git a/src/ReDIVA/data_test/motion_test.cpp b/src/ReDIVA/data_test/motion_test.cpp
index fdd5ff98..e8b18d7d 100644
--- a/src/ReDIVA/data_test/motion_test.cpp
+++ b/src/ReDIVA/data_test/motion_test.cpp
@@ -340,8 +340,6 @@ public:
     static void StageCallback(dw::Widget* data);
 };
 
-extern int32_t width;
-extern int32_t height;
 extern render_context* rctx_ptr;
 
 DataTestMot* data_test_mot;
diff --git a/src/ReDIVA/data_test/stage_test.cpp b/src/ReDIVA/data_test/stage_test.cpp
index d2b36c27..6e929fbb 100644
--- a/src/ReDIVA/data_test/stage_test.cpp
+++ b/src/ReDIVA/data_test/stage_test.cpp
@@ -38,9 +38,6 @@ public:
     static void StageCallback(dw::Widget* data);
 };
 
-extern int32_t width;
-extern int32_t height;
-
 DtmStg* dtm_stg;
 DtwStg* dtw_stg;