diff --git a/wst/trunk/config_objects.pas b/wst/trunk/config_objects.pas
index c6d4155a1..6e410936a 100644
--- a/wst/trunk/config_objects.pas
+++ b/wst/trunk/config_objects.pas
@@ -15,7 +15,7 @@
 unit config_objects;
 
 interface
-uses SysUtils, Classes, base_service_intf;
+uses SysUtils, Classes, base_service_intf, wst_types;
 
 type
 
diff --git a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
index 5d595b1c2..5959ddd96 100644
--- a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
+++ b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
@@ -28,7 +28,8 @@ uses
   test_soap_specific in '..\test_soap_specific.pas',
   test_generators_runtime in '..\test_generators_runtime.pas',
   date_utils in '..\..\..\date_utils.pas',
-  test_date_utils in '..\test_date_utils.pas';
+  test_date_utils in '..\test_date_utils.pas',
+  config_objects in '..\..\..\config_objects.pas';
 
 {$R *.res}
 
diff --git a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
index 578b7f5f0..e8ca2dc21 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
@@ -35,7 +35,7 @@
         <PackageName Value="fpcunittestrunner"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="19">
+    <Units Count="20">
       <Unit0>
         <Filename Value="wst_test_suite_gui.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -131,6 +131,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_date_utils"/>
       </Unit18>
+      <Unit19>
+        <Filename Value="..\..\config_objects.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="config_objects"/>
+      </Unit19>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
index 368e0be83..329956cef 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
@@ -18,7 +18,7 @@ uses
   test_basex_encode, json_formatter, server_service_json, test_json,
   test_suite_utils, test_generators, fpcunittestrunner, test_std_cursors,
   test_rtti_filter, rtti_filters, wst_cursors, test_wst_cursors, test_registry, test_soap_specific,
-  test_generators_runtime, test_date_utils;
+  test_generators_runtime, test_date_utils, config_objects;
 
 begin
   Application.Initialize;
diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc
index 447d8aad3..47dccfd46 100644
--- a/wst/trunk/wst_global.inc
+++ b/wst/trunk/wst_global.inc
@@ -46,6 +46,11 @@
       {$DEFINE WST_UNICODESTRING}
     {$ENDIF}
     {$DEFINE WST_SEMAPHORE_TIMEOUT}
+    {$IFDEF MSWINDOWS}
+      {$IFNDEF WINDOWS}
+        {$DEFINE WINDOWS}
+      {$ENDIF WINDOWS}
+    {$ENDIF}
   {$ENDIF}
 
   {$IFDEF CPU86}