--- a/dom/camera/GonkRecorder.h
+++ b/dom/camera/GonkRecorder.h
@@ -27,17 +27,17 @@
 
 #include "mozilla/RefPtr.h"
 #include "GonkCameraHwMgr.h"
 
 namespace android {
 
 class GonkCameraSource;
 struct MOZ_EXPORT MediaSource;
-struct MOZ_EXPORT MediaWriter;
+struct MediaWriter;
 class MOZ_EXPORT MetaData;
 struct MOZ_EXPORT AudioSource;
 class GonkCameraHardware;
 
 struct GonkRecorder {
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GonkRecorder)
 
     GonkRecorder();

--- a/dom/media/fmp4/gonk/GonkVideoDecoderManager.h
+++ b/dom/media/fmp4/gonk/GonkVideoDecoderManager.h
@@ -16,18 +16,18 @@
 #include "MediaCodecProxy.h"
 #include <stagefright/foundation/AHandler.h>
 #include "GonkNativeWindow.h"
 #include "GonkNativeWindowClient.h"
 
 using namespace android;
 
 namespace android {
-struct MOZ_EXPORT ALooper;
-class MOZ_EXPORT MediaBuffer;
+struct ALooper;
+class MediaBuffer;
 struct MOZ_EXPORT AString;
 class GonkNativeWindow;
 } // namespace android
 
 namespace mozilla {
 
 namespace layers {
 class TextureClient;

--- a/netwerk/protocol/rtsp/rtsp/ARawAudioAssembler.h
+++ b/netwerk/protocol/rtsp/rtsp/ARawAudioAssembler.h
@@ -18,17 +18,17 @@
 
 #define A_RAW_AUDIO_ASSEMBLER_H_
 
 #include "mozilla/Types.h"
 #include "ARTPAssembler.h"
 
 namespace android {
 
-struct MOZ_EXPORT AMessage;
+struct AMessage;
 struct MOZ_EXPORT AString;
 struct MOZ_EXPORT MetaData;
 
 struct ARawAudioAssembler : public ARTPAssembler {
     ARawAudioAssembler(
             const sp<AMessage> &notify,
             const char *desc, const AString &params);
 

--- a/netwerk/protocol/rtsp/rtsp/RTSPSource.h
+++ b/netwerk/protocol/rtsp/rtsp/RTSPSource.h
@@ -26,18 +26,18 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIStreamingProtocolController.h"
 #include "nsProxyRelease.h"
 
 namespace android {
 
 struct MOZ_EXPORT MetaData;
-struct MOZ_EXPORT ABuffer;
-struct MOZ_EXPORT ALooper;
+struct ABuffer;
+struct ALooper;
 struct MOZ_EXPORT AnotherPacketSource;
 struct RtspConnectionHandler;
 
 class RTSPSource : public RefBase
 {
 public:
 
     RTSPSource(

--- a/widget/gonk/nativewindow/GonkNativeWindowClientJB.h
+++ b/widget/gonk/nativewindow/GonkNativeWindowClientJB.h
@@ -29,17 +29,17 @@
 
 #include <utils/RefBase.h>
 #include <utils/threads.h>
 #include <utils/KeyedVector.h>
 
 #include "mozilla/Types.h"
 #include "GonkBufferQueue.h"
 
-struct MOZ_EXPORT ANativeWindow_Buffer;
+struct ANativeWindow_Buffer;
 
 namespace android {
 
 /*
  * An implementation of ANativeWindow that feeds graphics buffers into a
  * BufferQueue.
  *
  * This is typically used by programs that want to render frames through