4 files changed, 10 insertions, 20 deletions
diff --git a/Game/Code/lib/midi/MidiFile.pas b/Game/Code/lib/midi/MidiFile.pas
index e6306bec..0c150a8b 100644
--- a/Game/Code/lib/midi/MidiFile.pas
+++ b/Game/Code/lib/midi/MidiFile.pas
@@ -96,12 +96,10 @@ interface
 
 uses
   Windows,
-  Forms,
+  //Forms,
   Messages,
   SysUtils,
-  {$IFDEF LCL}
-  LCLIntf, // used for AllocateHWnd
-  {$ENDIF}
+  UCommon,
   Classes;
 
 type
@@ -941,11 +939,12 @@ begin
     case Msg of
       WM_MULTIMEDIA_TIMER:
       begin
-        try
+        //try
           MidiTimer(self);
-        except
-          Application.HandleException(Self);
-        end;
+        //except
+        // Note: HandleException() is called by default if exception is not handled
+        //  Application.HandleException(Self);
+        //end;
       end;
     else
       begin
diff --git a/Game/Code/lib/midi/Midiin.pas b/Game/Code/lib/midi/Midiin.pas
index 6820a740..8cb7beb7 100644
--- a/Game/Code/lib/midi/Midiin.pas
+++ b/Game/Code/lib/midi/Midiin.pas
@@ -111,9 +111,7 @@ uses
   Messages,
   Windows,
   MMSystem,
-  {$IFDEF LCL}
-  LCLIntf, // used for AllocateHWnd
-  {$ENDIF}
+  UCommon,
   MidiDefs,
   MidiType,
   MidiCons,
diff --git a/Game/Code/lib/midi/Midiout.pas b/Game/Code/lib/midi/Midiout.pas
index 0ad93591..cdbc762d 100644
--- a/Game/Code/lib/midi/Midiout.pas
+++ b/Game/Code/lib/midi/Midiout.pas
@@ -105,11 +105,8 @@ uses
   Windows,
   Messages,
   Classes,
-  //Controls,
   MMSystem,
-  {$IFDEF LCL}
-  LCLIntf, // used for AllocateHWnd
-  {$ENDIF}
+  UCommon,
   Circbuf,
   MidiType,
   MidiDefs,
diff --git a/Game/Code/lib/other/DirWatch.pas b/Game/Code/lib/other/DirWatch.pas
index b14fa791..95e0f8e9 100644
--- a/Game/Code/lib/other/DirWatch.pas
+++ b/Game/Code/lib/other/DirWatch.pas
@@ -31,11 +31,7 @@ uses
   Windows,
   Messages,
   SysUtils,
-  {$IFDEF LCL}
-  LCLIntf, // used for AllocateHWnd
-  {$ELSE}
-  Forms,
-  {$ENDIF}
+  UCommon,
   Classes;
 
 type