diff --git a/trunk/Projects/SAMufasaGUI/project1.lpr b/trunk/Projects/SAMufasaGUI/project1.lpr
index 5b244b4..fe2dc32 100644
--- a/trunk/Projects/SAMufasaGUI/project1.lpr
+++ b/trunk/Projects/SAMufasaGUI/project1.lpr
@@ -25,6 +25,8 @@ program project1;
 
 {$mode objfpc}{$H+}
 
+{$DEFINE SIMBA}
+
 uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads, cmem,
diff --git a/trunk/Projects/SAMufasaGUI/testunit.pas b/trunk/Projects/SAMufasaGUI/testunit.pas
index 56f7cd2..9941a8a 100644
--- a/trunk/Projects/SAMufasaGUI/testunit.pas
+++ b/trunk/Projects/SAMufasaGUI/testunit.pas
@@ -533,8 +533,8 @@ begin
     PluginsPath := LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS));
     ScriptErrorLine:= -1;
     CurrentSyncInfo.SyncMethod:= @Self.SafeCallThread;
-    //ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath);
-    ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath);
+    ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath);
+    //ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath);
     {$IFNDEF TERMINALWRITELN}
     ScriptThread.SetDebug(@formWriteln);
     ScriptThread.DebugMemo := Self.Memo1;
diff --git a/trunk/Units/MMLAddon/mmlpsthread.pas b/trunk/Units/MMLAddon/mmlpsthread.pas
index 4a5d2ac..ba64b11 100644
--- a/trunk/Units/MMLAddon/mmlpsthread.pas
+++ b/trunk/Units/MMLAddon/mmlpsthread.pas
@@ -186,7 +186,9 @@ uses
   strutils,
   tpa, //Tpa stuff
   forms,//Forms
-  lclintf; // for GetTickCount and others.
+  lclintf  // for GetTickCount and others.
+  {$IFDEF SIMBA} ,testunit {$ENDIF}
+  ;
 
 {$define PS_StdCall}
 {$MACRO ON}