diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48f7e13d..7af4cb97 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,8 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Private headers which are only needed for the library itself
-SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
+SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
+                          cr2image_int.hpp
                           crwimage_int.hpp
                           fujimn_int.hpp
                           makernote_int.hpp
@@ -53,7 +54,6 @@ SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
 # Add standalone C++ header files to this list
 SET( LIBEXIV2_HDR         basicio.hpp
                           bmpimage.hpp
-                          canonmn.hpp
                           convert.hpp
                           cr2image.hpp
                           crwimage.hpp
diff --git a/src/actions.cpp b/src/actions.cpp
index d8b2b505..4a62aff2 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -49,7 +49,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include "types.hpp"
 #include "exif.hpp"
 #include "easyaccess.hpp"
-#include "canonmn.hpp"
 #include "iptc.hpp"
 #include "xmp.hpp"
 #include "preview.hpp"
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index dc8db62d..8cc2479f 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -32,7 +32,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "canonmn.hpp"
+#include "canonmn_int.hpp"
 #include "value.hpp"
 #include "exif.hpp"
 #include "i18n.h"                // NLS support.
@@ -50,6 +50,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails canonOffOn[] = {
@@ -1387,4 +1388,4 @@ namespace Exiv2 {
         return sign * (val + frac) / 32.0f;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff --git a/src/canonmn.hpp b/src/canonmn_int.hpp
similarity index 94%
rename from src/canonmn.hpp
rename to src/canonmn_int.hpp
index 6e1e5bb9..2bec0034 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn_int.hpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*!
-  @file    canonmn.hpp
+  @file    canonmn_int.hpp
   @brief   Canon makernote tags.<BR>References:<BR>
            [1] <a href="http://www.burren.cx/david/canon.html">EXIF MakerNote of Canon</a> by David Burren<br>
            [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html">Canon makernote tags</a> by Phil Harvey
@@ -31,8 +31,8 @@
            07-Mar-04, ahu: isolated as a separate component<BR>
            12-Aug-06,  dc: started updating all tags
  */
-#ifndef CANONMN_HPP_
-#define CANONMN_HPP_
+#ifndef CANONMN_INT_HPP_
+#define CANONMN_INT_HPP_
 
 // *****************************************************************************
 // included header files
@@ -47,16 +47,15 @@
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
-
-// *****************************************************************************
-// class declarations
     class Value;
 
+    namespace Internal {
+
 // *****************************************************************************
 // class definitions
 
     //! MakerNote for Canon cameras
-    class EXIV2API CanonMakerNote {
+    class CanonMakerNote {
     public:
         //! Return read-only list of built-in Canon tags
         static const TagInfo* tagList();
@@ -139,8 +138,8 @@ namespace Exiv2 {
        128 -> 4
        143 -> 4.46875
      */
-    EXIV2API float canonEv(long val);
+    float canonEv(long val);
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
 
-#endif                                  // #ifndef CANONMN_HPP_
+#endif                                  // #ifndef CANONMN_INT_HPP_
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 24a9432a..813140c7 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -47,7 +47,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "futils.hpp"
 #include "value.hpp"
 #include "tags.hpp"
-#include "canonmn.hpp"
+#include "canonmn_int.hpp"
 #include "i18n.h"                // NLS support.
 
 // + standard includes
diff --git a/src/tags.cpp b/src/tags.cpp
index 46e4b180..c0b2922c 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -37,7 +37,9 @@ EXIV2_RCSID("@(#) $Id$")
 #include "error.hpp"
 #include "futils.hpp"
 #include "value.hpp"
-#include "canonmn.hpp"
+#include "i18n.h"                // NLS support.
+
+#include "canonmn_int.hpp"
 #include "fujimn_int.hpp"
 #include "minoltamn_int.hpp"
 #include "nikonmn_int.hpp"
@@ -46,7 +48,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include "pentaxmn_int.hpp"
 #include "sigmamn_int.hpp"
 #include "sonymn_int.hpp"
-#include "i18n.h"                // NLS support.
 
 #include <iostream>
 #include <iomanip>