diff --git a/src/ptp.h b/src/ptp.h
index 86b6b60..98a7def 100644
--- a/src/ptp.h
+++ b/src/ptp.h
@@ -22,6 +22,10 @@
 #ifndef __PTP_H__
 #define __PTP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdarg.h>
 #include <time.h>
 #include "libptp-endian.h"
@@ -745,7 +749,7 @@ typedef uint16_t (* PTPIOSendData)	(PTPParams* params, PTPContainer* ptp,
 					unsigned char *data, unsigned int size);
 typedef uint16_t (* PTPIOGetResp)	(PTPParams* params, PTPContainer* resp);
 typedef uint16_t (* PTPIOGetData)	(PTPParams* params, PTPContainer* ptp,
-					uint32_t *getlen,
+					uint64_t *getlen,
 					unsigned char **data);
 /* debug functions */
 typedef void (* PTPErrorFunc) (void *data, const char *format, va_list args);
@@ -918,5 +922,8 @@ uint16_t ptp_prop_getcodebyname	(PTPParams* params, char* propname);
 const char* ptp_prop_getvalbyname
 				(PTPParams* params, char* name, uint16_t dpc);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __PTP_H__ */