diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 3547d92a4fcaf8169234721a89312c1b9b9575ac..895c2694fde93a0e2a18752fdc51421a78409ee5 100644
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -95,6 +95,20 @@ exif_data_get_mnote_data (ExifData *d)
 	return (d && d->priv) ? d->priv->md : NULL;
 }
 
+ExifMem *
+exif_data_get_priv_mem (ExifData *d)
+{
+	return (d && d->priv) ? d->priv->mem : NULL;
+}
+
+void
+exif_data_set_priv_md (ExifData *d, ExifMnoteData *md)
+{
+	if (d && d->priv) {
+		d->priv->md = md;
+	}
+}
+
 ExifData *
 exif_data_new (void)
 {
diff --git a/libexif/exif-data.h b/libexif/exif-data.h
index e6582f8a74d41fe126d6d369282c1f02c7951812..26f67a7947f51cdb15f39748104587f5c3844cc9 100644
--- a/libexif/exif-data.h
+++ b/libexif/exif-data.h
@@ -153,6 +153,10 @@ void          exif_data_set_byte_order  (ExifData *data, ExifByteOrder order);
  */
 ExifMnoteData *exif_data_get_mnote_data (ExifData *d);
 
+ExifMem *exif_data_get_priv_mem (ExifData *d);
+
+void exif_data_set_priv_md (ExifData *d, ExifMnoteData *md);
+
 /*! Fix the EXIF data to bring it into specification. Call #exif_content_fix
  * on each IFD to fix existing entries, create any new entries that are
  * mandatory but do not yet exist, and remove any entries that are not
diff --git a/libexif/exif-format.h b/libexif/exif-format.h
index 8706b8414e88b4d6e7a013fadf74d45980d070eb..3085f200ec5df6a197b10b07f3a27cc5e533a830 100644
--- a/libexif/exif-format.h
+++ b/libexif/exif-format.h
@@ -35,13 +35,13 @@ typedef enum {
         EXIF_FORMAT_SHORT      =  3,
         EXIF_FORMAT_LONG       =  4,
         EXIF_FORMAT_RATIONAL   =  5,
-	EXIF_FORMAT_SBYTE      =  6,
+        EXIF_FORMAT_SBYTE      =  6,
         EXIF_FORMAT_UNDEFINED  =  7,
-	EXIF_FORMAT_SSHORT     =  8,
+        EXIF_FORMAT_SSHORT     =  8,
         EXIF_FORMAT_SLONG      =  9,
         EXIF_FORMAT_SRATIONAL  = 10,
-	EXIF_FORMAT_FLOAT      = 11,
-	EXIF_FORMAT_DOUBLE     = 12
+        EXIF_FORMAT_FLOAT      = 11,
+        EXIF_FORMAT_DOUBLE     = 12
 } ExifFormat;
 
 /*! Return a textual representation of the given EXIF data type.
diff --git a/libexif/huawei/exif-mnote-data-huawei.h b/libexif/huawei/exif-mnote-data-huawei.h
index 936d34b4e9c666605205010613c377f5ef40e676..bb50c94abb77fd98108197b0f756b4e0392a6a3b 100644
--- a/libexif/huawei/exif-mnote-data-huawei.h
+++ b/libexif/huawei/exif-mnote-data-huawei.h
@@ -60,7 +60,6 @@ struct _MnoteHuaweiEntryCount {
 
 int exif_mnote_data_huawei_identify (const ExifData *ed, const ExifEntry *e);
 
-ExifMnoteData *exif_mnote_data_huawei_new (ExifMem *mem);
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,7 +75,7 @@ int exif_mnote_data_add_entry (ExifMnoteData *ne, MnoteHuaweiEntry *e);
 void exif_mnote_data_remove_entry (ExifMnoteData *ne, MnoteHuaweiEntry *e);
 MnoteHuaweiEntry* exif_mnote_data_huawei_get_entry_by_tag (ExifMnoteDataHuawei *n, const MnoteHuaweiTag tag);
 MnoteHuaweiEntry* exif_mnote_data_huawei_get_entry_by_index (ExifMnoteDataHuawei *n, const int dest_idx);
-
+ExifMnoteData *exif_mnote_data_huawei_new (ExifMem *mem);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */