diff --git a/README.md b/README.md
index 5b76dd2d..00810181 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The file ReadMe.txt in a build bundle describes how to install the library on th
    16. [Cross Platform Build and Test on Linux for MinGW](#2-16)
    17. [Building with C++11 and other compilers](#2-17)
    18. [Static and Shared Libraries](#2-18)
-   19. [Support for bmff files (CR3, HIF, AVIF and HEIC)](#2-19)
+   19. [Support for bmff files (CR3, HEIF and AVIF)](#2-19)
 3. [License and Support](#3)
     1. [License](#3-1)
     2. [Support](#3-2)
@@ -783,7 +783,7 @@ This is discussed: [https://github.com/Exiv2/exiv2/issues/1230](https://github.c
 
 <div id="2-19">
 
-2.19 Support for bmff files (CR3, HIF, AVIF and HEIC)
+2.19 Support for bmff files (CR3, HEIF and AVIF)
 
 **Attention is drawn to the possibility that bmff support may be the subject of patent rights. _Exiv2 shall not be held responsible for identifying any or all such patent rights.  Exiv2 shall not be held responsible for the legal consequences of the use of this code_.**
 
diff --git a/include/exiv2/exiv2.hpp b/include/exiv2/exiv2.hpp
index ef9b60af..5efd9d57 100644
--- a/include/exiv2/exiv2.hpp
+++ b/include/exiv2/exiv2.hpp
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2018 Exiv2 authors
+ * Copyright (C) 2004-2021 Exiv2 authors
  * This program is part of the Exiv2 distribution.
  *
  * This program is free software; you can redistribute it and/or
@@ -17,13 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
-/*!
-  @file    exiv2.hpp
-  @brief   Include all Exiv2 header files.
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    21-Jun-10, ahu: created
- */
 #ifndef EXIV2_HPP_
 #define EXIV2_HPP_
 
@@ -46,17 +39,17 @@
 #include "exiv2/image.hpp"
 #include "exiv2/ini.hpp"
 #include "exiv2/iptc.hpp"
-#ifdef   EXV_ENABLE_BMFF
-#include "bmffimage.hpp"
-#endif// EXV_ENABLE_BMFF
 #include "exiv2/jp2image.hpp"
 #include "exiv2/jpgimage.hpp"
 #include "exiv2/metadatum.hpp"
 #include "exiv2/mrwimage.hpp"
 #include "exiv2/orfimage.hpp"
 #include "exiv2/pgfimage.hpp"
+#ifdef EXV_ENABLE_BMFF
+#include "bmffimage.hpp"
+#endif
 
-#ifdef   EXV_HAVE_LIBZ
+#ifdef EXV_HAVE_LIBZ
 #include "exiv2/pngimage.hpp"
 #endif
 
@@ -79,4 +72,4 @@
 #include "exiv2/xmp_exiv2.hpp"
 #include "exiv2/xmpsidecar.hpp"
 
-#endif                                  // #ifndef EXIV2_HPP_
+#endif//ifndef EXIV2_HPP_
diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1
index c0d570c6..4ce9b7cc 100644
--- a/man/man1/exiv2.1
+++ b/man/man1/exiv2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Mar 5, 2021"
+.TH EXIV2 1 "Mar 8, 2021"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -49,8 +49,7 @@ DNG	Read/Write	Read/Write	Read/Write	-	Read/Write
 EPS	-	-	Read/Write	-	-
 EXV	Read/Write	Read/Write	Read/Write	Read/Write Read/Write
 GIF	-	-	-	-	-
-HEIC	Read	Read	Read	-	-
-HIF	Read	Read	Read	-	-
+HEIF	Read	Read	Read	-	-
 JP2	Read/Write	Read/Write	Read/Write	-	Read/Write
 JPEG	Read/Write	Read/Write	Read/Write	Read/Write	Read/Write
 MRW	Read	Read	Read	-	-