diff --git a/media/mtp/MtpPacket.h b/media/mtp/MtpPacket.h
index 26a3c24..6632c6e 100644
--- a/media/mtp/MtpPacket.h
+++ b/media/mtp/MtpPacket.h
@@ -17,13 +17,17 @@
 #ifndef _MTP_PACKET_H
 #define _MTP_PACKET_H
 
-class MtpStringBuffer;
-
 #include "mtp.h"
 #include "MtpUtils.h"
 
 #include <stdint.h>
 
+struct usb_endpoint;
+
+namespace android {
+
+class MtpStringBuffer;
+
 class MtpPacket {
 
 protected:
@@ -65,4 +69,6 @@
     void                putUInt32(int offset, uint32_t value);
 };
 
+}; // namespace android
+
 #endif // _MTP_PACKET_H