diff --git a/components/fpexif/fpeutils.pas b/components/fpexif/fpeutils.pas
index ffe18810a..9bfcf0ca5 100644
--- a/components/fpexif/fpeutils.pas
+++ b/components/fpexif/fpeutils.pas
@@ -20,6 +20,11 @@ uses
 
 type
  {$IFDEF FPC}
+
+  {$IF FPC_FULLVERSION < 3000200}
+  TStringArray = array of string;
+  {$ENDIF}
+
   TInt64List = specialize TFPGList<int64>;
  {$ELSE}
   TInt64List = class(TList)
diff --git a/components/fpexif/fpexif_pkg.pas b/components/fpexif/fpexif_pkg.pas
index 191f397f8..5ff57c3e5 100644
--- a/components/fpexif/fpexif_pkg.pas
+++ b/components/fpexif/fpexif_pkg.pas
@@ -4,12 +4,11 @@
 
 unit fpexif_pkg;
 
-{$warn 5023 off : no warning about unused units}
 interface
 
 uses
   fpeGlobal, fpeTags, fpeUtils, fpeMetadata, fpeExifReadWrite, 
-  fpeIptcReadWrite, fpeExifData, fpeIptcData, fpeStrConsts, fpemakernote;
+  fpeIptcReadWrite, fpeExifData, fpeIptcData, fpeStrConsts, fpeMakerNote;
 
 implementation
 
diff --git a/components/fpexif/tests/multiread/MultiRead_Laz.res b/components/fpexif/tests/multiread/MultiRead_Laz.res
index f6e849956..e994dfa65 100644
Binary files a/components/fpexif/tests/multiread/MultiRead_Laz.res and b/components/fpexif/tests/multiread/MultiRead_Laz.res differ
diff --git a/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res b/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res
index 0ad004b9d..e1df0e994 100644
Binary files a/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res and b/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res differ