diff --git a/components/acs/Src/fileformats/acs_dsfiles.pas b/components/acs/Src/fileformats/acs_dsfiles.pas
index 0dc215e31..67c228f51 100644
--- a/components/acs/Src/fileformats/acs_dsfiles.pas
+++ b/components/acs/Src/fileformats/acs_dsfiles.pas
@@ -89,7 +89,11 @@ type
 
   TDSIn = class(TACSCustomFileIn)
   private
+    {$ifdef fpc}
+    FxFormat: _WAVEFORMATEX;
+    {$else}
     FxFormat: TWaveFormatEx;
+    {$endif}
     FxAMMultiMediaStream: IAMMultiMediaStream;
     FxGraphBuilder: IGraphBuilder;
     FxMediaSeeking: IMediaSeeking;
diff --git a/components/acs/Src/win32/ACS.dpk b/components/acs/Src/win32/ACS.dpk
index 5a5bf960c..712432995 100644
--- a/components/acs/Src/win32/ACS.dpk
+++ b/components/acs/Src/win32/ACS.dpk
@@ -33,7 +33,7 @@ contains
   ACS_Types in '..\classes\ACS_Types.pas',
   ACS_Audio in '..\classes\ACS_Audio.pas',
   ACS_AudioMix in '..\classes\ACS_AudioMix.pas',
-  ACS_CDROM in '..\classes\ACS_CDROM.pas',
+  ACS_CDROM in '..\classes\acs_cdrom.pas',
   ACS_Classes in '..\classes\ACS_Classes.pas',
   ACS_Converters in '..\classes\ACS_Converters.pas',
   ACS_File in '..\classes\ACS_File.pas',
@@ -54,7 +54,6 @@ contains
   DirectShow9 in '..\fileformats\windows\DirectShow9.pas',
   vorbisfile in '..\fileformats\general\vorbisfile.pas',
   vorbisenc in '..\fileformats\general\vorbisenc.pas',
-  codec in '..\fileformats\general\codec.pas',
   acs_dsfiles in '..\fileformats\ACS_DSFiles.pas',
   directdraw in '..\fileformats\windows\directdraw.pas',
   directsound in '..\fileformats\windows\directsound.pas',