diff --git a/packages/arosunits/src/exec.pas b/packages/arosunits/src/exec.pas
index e37477fb30..c28456fabc 100644
--- a/packages/arosunits/src/exec.pas
+++ b/packages/arosunits/src/exec.pas
@@ -86,6 +86,7 @@ const
   LFalse: LongInt = 0;
 
 // spinlock
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 type
   TSpinLock =
@@ -106,6 +107,7 @@ type
     3: (pad_align: packed array[0..128-1] of byte);            // ensure 128 byte record size
   end;
 {$endif}
+{$endif}
 
 type
 // List Node Structure.  Each member in a list starts with a Node
@@ -638,12 +640,14 @@ type
     mp_SigBit: Byte;     { signal bit number    }
     mp_SigTask: Pointer;   { task to be signalled (TaskPtr) }
     mp_MsgList: TList;     { message linked list  }
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 {$ifdef AROSEXEC_SMP}
     mp_SpinLock: TSpinLock;
 {$else}
     mp_Pad: TSpinlock;
 {$endif}
+{$endif}
 {$endif}
   end;
 
@@ -868,12 +872,14 @@ type
   TSemaphoreRequest = record
     sr_Link: TMinNode;
     sr_Waiter: PTask;
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 {$ifdef AROSEXEC_SMP}
     sr_SpinLock: TSpinLock;
 {$else}
     sr_pad: TSpinLock;
 {$endif}
+{$endif}
 {$endif}
   end;
 
diff --git a/rtl/aros/i386/execd.inc b/rtl/aros/i386/execd.inc
index 41eee71a18..19bd1de786 100644
--- a/rtl/aros/i386/execd.inc
+++ b/rtl/aros/i386/execd.inc
@@ -29,6 +29,7 @@
   * }
 
 
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 type
   TSpinLock =
@@ -49,6 +50,7 @@ type
     3: (pad_align: packed array[0..128-1] of byte);            // ensure 128 byte record size
   end;
 {$endif}
+{$endif}
 
 
 
@@ -604,12 +606,14 @@ type  // Checked OK 05.08.2011 ALB
     mp_SigBit : Byte;
     mp_SigTask: Pointer;
     mp_MsgList: TEList;
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 {$ifdef AROSEXEC_SMP}
     mp_SpinLock: TSpinLock;
 {$else}
     mp_pad: TSpinLock;
 {$endif}
+{$endif}
 {$endif}
   end;
 
@@ -1100,12 +1104,14 @@ type
   TSemaphoreRequest = record
     sr_Link  : TMinNode;
     sr_Waiter: PTask;
+{$ifdef AROS_ABIv1}
 {$ifdef AROSPLATFORM_SMP}
 {$ifdef AROSEXEC_SMP}
     sr_SpinLock: TSpinLock;
 {$else}
     sr_pad: TSpinLock;
 {$endif}
+{$endif}
 {$endif}
   end;