diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index 5b9b9a6b..5fd30cb3 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -73,6 +73,26 @@ int num_fences;
 
 drm_intel_bo *busy_bo;
 
+struct option_struct {
+    unsigned scratch_buf_size;
+    unsigned max_dimension;
+    unsigned num_buffers;
+    int trace_tile;
+    int no_hw;
+    int gpu_busy_load;
+    int use_render;
+    int use_blt;
+    int forced_tiling;
+    int use_cpu_maps;
+    int total_rounds;
+    int fail;
+    int tiles_per_buf;
+    int ducttape;
+    int tile_size;
+    int check_render_cpyfn;
+    int use_signal_helper;
+};
+
 struct option_struct options;
 
 #define MAX_BUFS		4096
diff --git a/tests/gem_stress.h b/tests/gem_stress.h
index 82e8a574..ef7e963b 100644
--- a/tests/gem_stress.h
+++ b/tests/gem_stress.h
@@ -26,28 +26,6 @@ struct scratch_buf {
     unsigned num_tiles;
 };
 
-struct option_struct {
-    unsigned scratch_buf_size;
-    unsigned max_dimension;
-    unsigned num_buffers;
-    int trace_tile;
-    int no_hw;
-    int gpu_busy_load;
-    int use_render;
-    int use_blt;
-    int forced_tiling;
-    int use_cpu_maps;
-    int total_rounds;
-    int fail;
-    int tiles_per_buf;
-    int ducttape;
-    int tile_size;
-    int check_render_cpyfn;
-    int use_signal_helper;
-};
-
-extern struct option_struct options;
-
 void keep_gpu_busy(void);
 
 static inline void emit_vertex_2s(struct intel_batchbuffer *batch,