diff --git a/components/fpexif/fpeexifreadwrite.pas b/components/fpexif/fpeexifreadwrite.pas
index c5165b2f6..5e9bd9666 100644
--- a/components/fpexif/fpeexifreadwrite.pas
+++ b/components/fpexif/fpeexifreadwrite.pas
@@ -318,7 +318,9 @@ var
   tagPos: Int64;
   newPos: Int64;
 begin
+  {$IFDEF FPC}
   ifdRec := Default(TIFDRecord);
+  {$ENDIF}
 
   // Read count of directory entries
   numRecords := FixEndian16(ReadWord(AStream));
diff --git a/components/fpexif/fpemetadata.pas b/components/fpexif/fpemetadata.pas
index 16e4554ef..a6c0ccd5d 100644
--- a/components/fpexif/fpemetadata.pas
+++ b/components/fpexif/fpemetadata.pas
@@ -402,7 +402,11 @@ var
   headerSize: Word;
   n, count: Int64;
   savedPos: Int64;
+  {$IFDEF FPC}
   s: RawByteString;
+  {$ELSE}
+  s: String;
+  {$ENDIF}
 begin
   // Write the header segment and all metadata segments stored in TImgInfo
   // to the beginning of the stream
diff --git a/components/fpexif/fpeutils.pas b/components/fpexif/fpeutils.pas
index 61a6ed7d0..695672cd2 100644
--- a/components/fpexif/fpeutils.pas
+++ b/components/fpexif/fpeutils.pas
@@ -1,4 +1,4 @@
-unit fpeUtils;
+unit fpeUtils;
 
 {$IFDEF FPC}
   {$mode ObjFPC}{$H+}