diff --git a/wst/trunk/indy_http_server.pas b/wst/trunk/indy_http_server.pas
index bc42c95c5..7b9cf8f2d 100644
--- a/wst/trunk/indy_http_server.pas
+++ b/wst/trunk/indy_http_server.pas
@@ -91,13 +91,13 @@ implementation
 uses
 {$IFDEF WST_DELPHI}
      ActiveX,
-  {$IFDEF INDY_9}
-     wst_indy9_utils,
-  {$ENDIF INDY_9}
-  {$IFDEF INDY_10}
-     wst_indy10_utils, IdSchedulerOfThread, IdSchedulerOfThreadDefault,
-  {$ENDIF}
 {$ENDIF WST_DELPHI}
+{$IFDEF INDY_9}
+     wst_indy9_utils,
+{$ENDIF INDY_9}
+{$IFDEF INDY_10}
+     wst_indy10_utils, IdSchedulerOfThread, IdSchedulerOfThreadDefault,
+{$ENDIF}
      base_service_intf,
      server_service_intf, server_service_imputils,
      metadata_wsdl;
diff --git a/wst/trunk/samples/delphi/http_server/http_server.dpr b/wst/trunk/samples/delphi/http_server/http_server.dpr
index 2acc227bb..6758392b4 100644
--- a/wst/trunk/samples/delphi/http_server/http_server.dpr
+++ b/wst/trunk/samples/delphi/http_server/http_server.dpr
@@ -19,8 +19,7 @@ uses
   user_service_intf in '..\..\user_service_intf.pas',
   user_service_intf_binder in '..\..\user_service_intf_binder.pas',
   user_service_intf_imp in '..\..\user_service_intf_imp.pas',
-  server_service_intf in '..\..\..\server_service_intf.pas',
-  wst_indy10_utils in '..\..\..\wst_indy10_utils.pas';
+  server_service_intf in '..\..\..\server_service_intf.pas';
 
 var
   AppObject : TwstListener; AppObject2 : TwstListener;
diff --git a/wst/trunk/samples/http_server/http_server.lpi b/wst/trunk/samples/http_server/http_server.lpi
index dda5e54c2..496ee4dda 100644
--- a/wst/trunk/samples/http_server/http_server.lpi
+++ b/wst/trunk/samples/http_server/http_server.lpi
@@ -52,7 +52,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="http_server"/>
@@ -67,9 +67,6 @@
         <IncludeAssertionCode Value="True"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Linking>
       <Debugging>
         <UseLineInfoUnit Value="False"/>
diff --git a/wst/trunk/wst_indy10_utils.pas b/wst/trunk/wst_indy10_utils.pas
index 9e7a09555..3f9968e45 100644
--- a/wst/trunk/wst_indy10_utils.pas
+++ b/wst/trunk/wst_indy10_utils.pas
@@ -27,20 +27,28 @@ type
   end;
 
 implementation
-uses ActiveX;
+
+{$IFDEF WST_DELPHI}
+uses 
+  ActiveX;
+{$ENDIF WST_DELPHI}
 
 { TwstIndy10Thread }
 
 procedure TwstIndy10Thread.AfterExecute();
 begin
+{$IFDEF WST_DELPHI}
   CoUninitialize();
+{$ENDIF WST_DELPHI}
   inherited;
 end;
 
 procedure TwstIndy10Thread.BeforeExecute();
 begin
   inherited;
+{$IFDEF WST_DELPHI}
   CoInitialize(nil);
+{$ENDIF WST_DELPHI}
 end;
 
 
diff --git a/wst/trunk/wst_indy9_utils.pas b/wst/trunk/wst_indy9_utils.pas
index 7d7109c01..638d23427 100644
--- a/wst/trunk/wst_indy9_utils.pas
+++ b/wst/trunk/wst_indy9_utils.pas
@@ -26,20 +26,27 @@ type
   end;
 
 implementation
-uses ActiveX;
+{$IFDEF WST_DELPHI}
+uses 
+  ActiveX;
+{$ENDIF WST_DELPHI}
 
 { TwstIndy9Thread }
 
 procedure TwstIndy9Thread.AfterExecute;
 begin
+{$IFDEF WST_DELPHI}
   CoUninitialize();
+{$ENDIF WST_DELPHI}
   inherited;
 end;
 
 procedure TwstIndy9Thread.BeforeExecute;
 begin
   inherited;
+{$IFDEF WST_DELPHI}
   CoInitialize(nil);
+{$ENDIF WST_DELPHI}
 end;
 
 end.