diff --git a/test/loader_test/main.c b/test/loader_test/main.c
index 1d783d1..f4faedd 100644
--- a/test/loader_test/main.c
+++ b/test/loader_test/main.c
@@ -16,6 +16,8 @@ extern int test_release_calls();

 extern int test_icd_match();

+int ret_val;
+
 int main(int argc, char **argv)
 {
     test_icd_initialize_app_log();
diff --git a/test/loader_test/test_cl_runtime.c b/test/loader_test/test_cl_runtime.c
index 6b08212..b0ddd7b 100644
--- a/test/loader_test/test_cl_runtime.c
+++ b/test/loader_test/test_cl_runtime.c
@@ -4,7 +4,7 @@

 extern cl_command_queue command_queue;

-cl_int ret_val;
+extern cl_int ret_val;

 const struct clRetainCommandQueue_st clRetainCommandQueueData[NUM_ITEMS_clRetainCommandQueue] = {
        {NULL}
diff --git a/test/loader_test/test_clgl.c b/test/loader_test/test_clgl.c
index 4e3cee4..e17e872 100644
--- a/test/loader_test/test_clgl.c
+++ b/test/loader_test/test_clgl.c
@@ -12,7 +12,7 @@ extern cl_mem buffer;
 extern cl_command_queue command_queue;
 extern cl_event event;
 extern cl_context_properties context_properties[3];
-cl_int ret_val;
+extern cl_int ret_val;
 cl_mem ret_mem;

 struct clCreateFromGLBuffer_st clCreateFromGLBufferData[NUM_ITEMS_clCreateFromGLBuffer] = {
diff --git a/test/loader_test/test_image_objects.c b/test/loader_test/test_image_objects.c
index f399451..8de222e 100644
--- a/test/loader_test/test_image_objects.c
+++ b/test/loader_test/test_image_objects.c
@@ -10,7 +10,7 @@ extern cl_command_queue command_queue;
 extern cl_event event;
 extern cl_mem buffer;

-int ret_val;
+extern int ret_val;

 const struct clGetSupportedImageFormats_st clGetSupportedImageFormatsData[NUM_ITEMS_clGetSupportedImageFormats] =
 {
diff --git a/test/loader_test/test_kernel.c b/test/loader_test/test_kernel.c
index a53e980..32be897 100644
--- a/test/loader_test/test_kernel.c
+++ b/test/loader_test/test_kernel.c
@@ -15,7 +15,7 @@ extern cl_event event;
 extern cl_context  context;
 extern cl_command_queue command_queue;
 extern cl_device_id devices;
-int ret_val;
+extern int ret_val;
 extern void CL_CALLBACK setevent_callback(cl_event _a, cl_int _b, void* _c);
 extern void CL_CALLBACK setprintf_callback(cl_context _a, cl_uint _b, char* _c, void* _d );

diff --git a/test/loader_test/test_platforms.c b/test/loader_test/test_platforms.c
index d22a3d0..7750e4c 100644
--- a/test/loader_test/test_platforms.c
+++ b/test/loader_test/test_platforms.c
@@ -8,7 +8,7 @@ extern cl_platform_id  platform;

 extern cl_device_id devices;

-int ret_val;
+extern int ret_val;

 struct clRetainContext_st clRetainContextData[NUM_ITEMS_clRetainContext] =
 {
diff --git a/test/loader_test/test_program_objects.c b/test/loader_test/test_program_objects.c
index 30c99a1..ab5cc8b 100644
--- a/test/loader_test/test_program_objects.c
+++ b/test/loader_test/test_program_objects.c
@@ -7,7 +7,7 @@ extern cl_program program;
 extern cl_platform_id platform;
 extern cl_device_id devices;

-int ret_val;
+extern int ret_val;

 extern void CL_CALLBACK program_callback(cl_program _a, void* _b);

diff --git a/test/loader_test/test_sampler_objects.c b/test/loader_test/test_sampler_objects.c
index 1f2835f..f57ac18 100644
--- a/test/loader_test/test_sampler_objects.c
+++ b/test/loader_test/test_sampler_objects.c
@@ -3,7 +3,7 @@
 #include <platform/icd_test_log.h>

 extern cl_sampler  sampler;
-int ret_val;
+extern int ret_val;

 const struct clRetainSampler_st clRetainSamplerData[NUM_ITEMS_clRetainSampler]=
 {