diff --git a/components/acs/Src/classes/acs_audio.pas b/components/acs/Src/classes/acs_audio.pas
index bcedf2e1a..cf73e9308 100644
--- a/components/acs/Src/classes/acs_audio.pas
+++ b/components/acs/Src/classes/acs_audio.pas
@@ -77,6 +77,10 @@ driver handling classes (basic audio class)
 
 unit acs_audio;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_audiomix.pas b/components/acs/Src/classes/acs_audiomix.pas
index 46ff199f6..319dc831d 100644
--- a/components/acs/Src/classes/acs_audiomix.pas
+++ b/components/acs/Src/classes/acs_audiomix.pas
@@ -40,6 +40,10 @@ changed mail adress
 {$hints off}
 unit acs_audiomix;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_cdrom.pas b/components/acs/Src/classes/acs_cdrom.pas
index 0e990ac3b..2f0a91267 100644
--- a/components/acs/Src/classes/acs_cdrom.pas
+++ b/components/acs/Src/classes/acs_cdrom.pas
@@ -79,6 +79,10 @@ changed mail adress
 
 unit acs_cdrom;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_classes.pas b/components/acs/Src/classes/acs_classes.pas
index 34ef30299..ec90fc111 100644
--- a/components/acs/Src/classes/acs_classes.pas
+++ b/components/acs/Src/classes/acs_classes.pas
@@ -100,6 +100,10 @@ changed mail adress
 
 unit acs_classes;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_converters.pas b/components/acs/Src/classes/acs_converters.pas
index 2c1b16cb8..18a4143a0 100644
--- a/components/acs/Src/classes/acs_converters.pas
+++ b/components/acs/Src/classes/acs_converters.pas
@@ -52,6 +52,10 @@ changed mail adress
 
 unit acs_converters;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_file.pas b/components/acs/Src/classes/acs_file.pas
index fd2f9c16c..ec69e125c 100644
--- a/components/acs/Src/classes/acs_file.pas
+++ b/components/acs/Src/classes/acs_file.pas
@@ -63,7 +63,11 @@ only TFileIn and TFileOut are Visible
 this unit introduces basic fileformat support
 }
 
-unit acs_file; 
+unit acs_file;
+
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
 
 interface
 
diff --git a/components/acs/Src/classes/acs_filters.pas b/components/acs/Src/classes/acs_filters.pas
index 60b374463..ee9680527 100644
--- a/components/acs/Src/classes/acs_filters.pas
+++ b/components/acs/Src/classes/acs_filters.pas
@@ -34,6 +34,10 @@ changed mail adress
 
 unit acs_filters;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_indicator.pas b/components/acs/Src/classes/acs_indicator.pas
index 18a3c9c5c..bb9a31f5d 100644
--- a/components/acs/Src/classes/acs_indicator.pas
+++ b/components/acs/Src/classes/acs_indicator.pas
@@ -35,6 +35,10 @@ changed mail adress
 
 unit acs_indicator;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_misc.pas b/components/acs/Src/classes/acs_misc.pas
index 38cab7592..2bd585b65 100644
--- a/components/acs/Src/classes/acs_misc.pas
+++ b/components/acs/Src/classes/acs_misc.pas
@@ -50,6 +50,10 @@ changed mail adress
 
 unit acs_misc;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_mixer.pas b/components/acs/Src/classes/acs_mixer.pas
index 6be879a75..8f6fc5696 100644
--- a/components/acs/Src/classes/acs_mixer.pas
+++ b/components/acs/Src/classes/acs_mixer.pas
@@ -72,6 +72,10 @@ changed mail adress
 
 unit acs_mixer;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_multimix.pas b/components/acs/Src/classes/acs_multimix.pas
index 9bf7d3810..a8e98d7f2 100644
--- a/components/acs/Src/classes/acs_multimix.pas
+++ b/components/acs/Src/classes/acs_multimix.pas
@@ -54,6 +54,10 @@ TMultiMixer by Ross Levis added
 {$hints off}
 unit acs_multimix;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_procs.pas b/components/acs/Src/classes/acs_procs.pas
index ab265a948..012455be1 100644
--- a/components/acs/Src/classes/acs_procs.pas
+++ b/components/acs/Src/classes/acs_procs.pas
@@ -28,6 +28,10 @@ changed mail adress
 
 unit acs_procs;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/classes/acs_streams.pas b/components/acs/Src/classes/acs_streams.pas
index a33ae907b..9dcd45d35 100644
--- a/components/acs/Src/classes/acs_streams.pas
+++ b/components/acs/Src/classes/acs_streams.pas
@@ -41,6 +41,9 @@ changed mail adress
 
 unit acs_streams;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
 
 interface
 
diff --git a/components/acs/Src/classes/acs_volumequery.pas b/components/acs/Src/classes/acs_volumequery.pas
index cf27983a9..28619fd9a 100644
--- a/components/acs/Src/classes/acs_volumequery.pas
+++ b/components/acs/Src/classes/acs_volumequery.pas
@@ -29,6 +29,10 @@ make TAudioIn workable
 
 unit acs_volumequery;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/drivers/acs_stdaudio.pas b/components/acs/Src/drivers/acs_stdaudio.pas
index dc303862f..39db5595c 100644
--- a/components/acs/Src/drivers/acs_stdaudio.pas
+++ b/components/acs/Src/drivers/acs_stdaudio.pas
@@ -75,6 +75,10 @@ changed mail adress
 
 unit acs_stdaudio;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/drivers/linux/libao.pas b/components/acs/Src/drivers/linux/libao.pas
index b09c7d923..cbfcdedf6 100644
--- a/components/acs/Src/drivers/linux/libao.pas
+++ b/components/acs/Src/drivers/linux/libao.pas
@@ -37,6 +37,10 @@ changed mail adress
 
 unit libao;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/acs_flac.pas b/components/acs/Src/fileformats/acs_flac.pas
index d2c8585dc..61f8a86a1 100644
--- a/components/acs/Src/fileformats/acs_flac.pas
+++ b/components/acs/Src/fileformats/acs_flac.pas
@@ -43,6 +43,10 @@ changed mail adress
 
 unit acs_flac;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/acs_lame.pas b/components/acs/Src/fileformats/acs_lame.pas
index b82033cb0..2300c07a9 100644
--- a/components/acs/Src/fileformats/acs_lame.pas
+++ b/components/acs/Src/fileformats/acs_lame.pas
@@ -46,6 +46,10 @@ changed mail adress
 
 unit acs_lame;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/acs_mpeg.pas b/components/acs/Src/fileformats/acs_mpeg.pas
index 9b4e219ed..1a1996293 100644
--- a/components/acs/Src/fileformats/acs_mpeg.pas
+++ b/components/acs/Src/fileformats/acs_mpeg.pas
@@ -1,5 +1,9 @@
 unit acs_mpeg; 
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/acs_vorbis.pas b/components/acs/Src/fileformats/acs_vorbis.pas
index 1a447c3eb..83f79eef1 100644
--- a/components/acs/Src/fileformats/acs_vorbis.pas
+++ b/components/acs/Src/fileformats/acs_vorbis.pas
@@ -54,6 +54,10 @@ changed mail adress
 
 unit acs_vorbis;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 {$DEFINE USE_VORBIS_11}
 
 interface
diff --git a/components/acs/Src/fileformats/acs_wave.pas b/components/acs/Src/fileformats/acs_wave.pas
index 9f9faadfc..bb2398b61 100644
--- a/components/acs/Src/fileformats/acs_wave.pas
+++ b/components/acs/Src/fileformats/acs_wave.pas
@@ -60,6 +60,10 @@ changed mail adress
 
 unit acs_wave;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/flac.pas b/components/acs/Src/fileformats/general/flac.pas
index d5e463b12..7bc2bdf0f 100644
--- a/components/acs/Src/fileformats/general/flac.pas
+++ b/components/acs/Src/fileformats/general/flac.pas
@@ -27,6 +27,10 @@ changed mail adress
 
 unit flac;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/lame.pas b/components/acs/Src/fileformats/general/lame.pas
index ac6a3b20e..ba04a4282 100644
--- a/components/acs/Src/fileformats/general/lame.pas
+++ b/components/acs/Src/fileformats/general/lame.pas
@@ -31,6 +31,10 @@ changed mail adress
 
 unit lame;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/mad.pas b/components/acs/Src/fileformats/general/mad.pas
index 430f8a9df..d4fc56089 100644
--- a/components/acs/Src/fileformats/general/mad.pas
+++ b/components/acs/Src/fileformats/general/mad.pas
@@ -30,6 +30,10 @@ changed mail adress
 
 unit mad;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/ogg.pas b/components/acs/Src/fileformats/general/ogg.pas
index 4ff916593..df29e0dce 100644
--- a/components/acs/Src/fileformats/general/ogg.pas
+++ b/components/acs/Src/fileformats/general/ogg.pas
@@ -31,6 +31,10 @@ changed mail adress
 
 unit ogg;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/vorbiscodec.pas b/components/acs/Src/fileformats/general/vorbiscodec.pas
index 6a1f0d313..6aae6c622 100644
--- a/components/acs/Src/fileformats/general/vorbiscodec.pas
+++ b/components/acs/Src/fileformats/general/vorbiscodec.pas
@@ -36,6 +36,10 @@ changed mail adress
 
 unit vorbiscodec;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/vorbisenc.pas b/components/acs/Src/fileformats/general/vorbisenc.pas
index 225bc4883..a46bfd5c6 100644
--- a/components/acs/Src/fileformats/general/vorbisenc.pas
+++ b/components/acs/Src/fileformats/general/vorbisenc.pas
@@ -32,6 +32,10 @@ changed mail adress
 
 unit vorbisenc;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/fileformats/general/vorbisfile.pas b/components/acs/Src/fileformats/general/vorbisfile.pas
index 7a4f49b43..5f907affd 100644
--- a/components/acs/Src/fileformats/general/vorbisfile.pas
+++ b/components/acs/Src/fileformats/general/vorbisfile.pas
@@ -43,6 +43,9 @@ changed mail adress
 
 unit vorbisfile;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
 
 interface
 
diff --git a/components/acs/Src/fileformats/linux/smpeg.pas b/components/acs/Src/fileformats/linux/smpeg.pas
index 4a29b9e11..aa3b37aa7 100644
--- a/components/acs/Src/fileformats/linux/smpeg.pas
+++ b/components/acs/Src/fileformats/linux/smpeg.pas
@@ -50,6 +50,10 @@ changed mail adress
 
 unit smpeg;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 uses
diff --git a/components/acs/Src/linux/laz_acs.lpk b/components/acs/Src/linux/laz_acs.lpk
index 25eeb53f3..a0b0f63e5 100644
--- a/components/acs/Src/linux/laz_acs.lpk
+++ b/components/acs/Src/linux/laz_acs.lpk
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
+  <Package Version="3">
     <Name Value="laz_acs"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="8"/>
       <SearchPaths>
         <IncludeFiles Value="../classes/linux/;../fileformats/linux/;../drivers/linux/"/>
         <OtherUnitFiles Value="../classes/;../classes/linux/;../fileformats/;../fileformats/linux/;../fileformats/general/;../drivers/;../drivers/linux/"/>
@@ -11,12 +11,10 @@
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
-          <DelphiCompat Value="True"/>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
         </SyntaxOptions>
       </Parsing>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
diff --git a/components/acs/Src/linux/laz_acs.pas b/components/acs/Src/linux/laz_acs.pas
index 71de88044..c32358e60 100644
--- a/components/acs/Src/linux/laz_acs.pas
+++ b/components/acs/Src/linux/laz_acs.pas
@@ -1,5 +1,5 @@
-{ Diese Datei wurde automatisch von Lazarus erzeugt. Sie darf nicht bearbeitet werden!
-Dieser Quelltext dient nur dem Übersetzen und Installieren des Packages.
+{ This file was automatically created by Lazarus. do not edit!
+  This source is only used to compile and install the package.
  }
 
 unit laz_acs; 
@@ -8,9 +8,9 @@ interface
 
 uses
   acs_audio, acs_audiomix, acs_cdrom, acs_classes, acs_converters, acs_file, 
-    acs_filters, acs_indicator, acs_misc, acs_mixer, acs_multimix, acs_streams, 
-    acs_strings, acs_types, acs_stdaudio, acs_reg, acs_allformats, 
-    LazarusPackageIntf; 
+  acs_filters, acs_indicator, acs_misc, acs_mixer, acs_multimix, acs_streams, 
+  acs_strings, acs_types, acs_stdaudio, acs_reg, acs_allformats, 
+  LazarusPackageIntf;
 
 implementation
 
diff --git a/components/acs/Src/win32/laz_acs.lpk b/components/acs/Src/win32/laz_acs.lpk
index fba45e111..52a2dcb43 100644
--- a/components/acs/Src/win32/laz_acs.lpk
+++ b/components/acs/Src/win32/laz_acs.lpk
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
+  <Package Version="3">
     <PathDelim Value="\"/>
     <Name Value="LAZ_ACS"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="8"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="..\classes\windows\;..\fileformats\windows\;..\drivers\windows\;..\dsp\"/>
@@ -13,11 +13,11 @@
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
-          <DelphiCompat Value="True"/>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
         </SyntaxOptions>
       </Parsing>
       <CodeGeneration>
-        <Generate Value="Faster"/>
         <Optimizations>
           <OptimizationLevel Value="2"/>
         </Optimizations>