diff --git a/src/QtAV/AVDemuxThread.h b/src/QtAV/AVDemuxThread.h
index eefa3ef1..607c4631 100644
--- a/src/QtAV/AVDemuxThread.h
+++ b/src/QtAV/AVDemuxThread.h
@@ -31,7 +31,7 @@ namespace QtAV {
 
 class AVDemuxer;
 class AVThread;
-class Q_AV_EXPORT AVDemuxThread : public QThread
+class AVDemuxThread : public QThread
 {
     Q_OBJECT
 public:
diff --git a/src/QtAV/QtAV_Global.h b/src/QtAV/QtAV_Global.h
index 7a0395c0..19023fd8 100644
--- a/src/QtAV/QtAV_Global.h
+++ b/src/QtAV/QtAV_Global.h
@@ -34,6 +34,7 @@
 #  undef Q_AV_EXPORT
 #  define Q_AV_EXPORT Q_DECL_IMPORT //only for vc?
 #endif
+#define Q_AV_PRIVATE_EXPORT Q_AV_EXPORT
 
 /* runtime version. used to compare with compile time version */
 Q_AV_EXPORT unsigned QtAV_Version();
diff --git a/src/QtAV/VideoShader.h b/src/QtAV/VideoShader.h
index 50859bf2..443eb214 100644
--- a/src/QtAV/VideoShader.h
+++ b/src/QtAV/VideoShader.h
@@ -122,7 +122,7 @@ protected:
     DPTR_DECLARE(VideoMaterial)
 };
 
-class TexturedGeometry {
+class Q_AV_EXPORT TexturedGeometry {
 public:
     typedef struct {
         float x, y;
diff --git a/src/QtAV/private/AVDecoder_p.h b/src/QtAV/private/AVDecoder_p.h
index 45466352..b78691db 100644
--- a/src/QtAV/private/AVDecoder_p.h
+++ b/src/QtAV/private/AVDecoder_p.h
@@ -30,7 +30,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT AVDecoderPrivate : public DPtrPrivate<AVDecoder>
+class Q_AV_PRIVATE_EXPORT AVDecoderPrivate : public DPtrPrivate<AVDecoder>
 {
 public:
     AVDecoderPrivate():
diff --git a/src/QtAV/private/AVOutput_p.h b/src/QtAV/private/AVOutput_p.h
index ab8970bb..b0b36f72 100644
--- a/src/QtAV/private/AVOutput_p.h
+++ b/src/QtAV/private/AVOutput_p.h
@@ -35,7 +35,7 @@ class Filter;
 class FilterContext;
 class Statistics;
 class OutputSet;
-class Q_AV_EXPORT AVOutputPrivate : public DPtrPrivate<AVOutput>
+class Q_AV_PRIVATE_EXPORT AVOutputPrivate : public DPtrPrivate<AVOutput>
 {
 public:
     AVOutputPrivate():
diff --git a/src/QtAV/private/AudioOutput_p.h b/src/QtAV/private/AudioOutput_p.h
index cb597c8d..e23f17a1 100644
--- a/src/QtAV/private/AudioOutput_p.h
+++ b/src/QtAV/private/AudioOutput_p.h
@@ -31,7 +31,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT AudioOutputPrivate : public AVOutputPrivate
+class Q_AV_PRIVATE_EXPORT AudioOutputPrivate : public AVOutputPrivate
 {
 public:
     AudioOutputPrivate():
diff --git a/src/QtAV/private/AudioResampler_p.h b/src/QtAV/private/AudioResampler_p.h
index 94498c92..913ece98 100644
--- a/src/QtAV/private/AudioResampler_p.h
+++ b/src/QtAV/private/AudioResampler_p.h
@@ -29,7 +29,7 @@
 namespace QtAV {
 
 class AudioResampler;
-class AudioResamplerPrivate : public DPtrPrivate<AudioResampler>
+class Q_AV_PRIVATE_EXPORT AudioResamplerPrivate : public DPtrPrivate<AudioResampler>
 {
 public:
     AudioResamplerPrivate():
diff --git a/src/QtAV/private/Frame_p.h b/src/QtAV/private/Frame_p.h
index b3ac91ed..5aa75d29 100644
--- a/src/QtAV/private/Frame_p.h
+++ b/src/QtAV/private/Frame_p.h
@@ -30,7 +30,7 @@
 namespace QtAV {
 
 class Frame;
-class Q_AV_EXPORT FramePrivate : public QSharedData
+class FramePrivate : public QSharedData
 {
 public:
     FramePrivate()
diff --git a/src/QtAV/private/ImageConverter_p.h b/src/QtAV/private/ImageConverter_p.h
index 3fd3bc37..88fb76cd 100644
--- a/src/QtAV/private/ImageConverter_p.h
+++ b/src/QtAV/private/ImageConverter_p.h
@@ -29,7 +29,7 @@
 namespace QtAV {
 
 class ImageConverter;
-class Q_AV_EXPORT ImageConverterPrivate : public DPtrPrivate<ImageConverter>
+class Q_AV_PRIVATE_EXPORT ImageConverterPrivate : public DPtrPrivate<ImageConverter>
 {
 public:
     ImageConverterPrivate()
diff --git a/src/QtAV/private/QPainterRenderer_p.h b/src/QtAV/private/QPainterRenderer_p.h
index 5de2d065..433f1f0e 100644
--- a/src/QtAV/private/QPainterRenderer_p.h
+++ b/src/QtAV/private/QPainterRenderer_p.h
@@ -29,7 +29,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT QPainterRendererPrivate : public VideoRendererPrivate
+class Q_AV_PRIVATE_EXPORT QPainterRendererPrivate : public VideoRendererPrivate
 {
 public:
     QPainterRendererPrivate():
diff --git a/src/QtAV/private/VideoDecoderFFmpegHW_p.h b/src/QtAV/private/VideoDecoderFFmpegHW_p.h
index 733acc4f..f6000e0e 100644
--- a/src/QtAV/private/VideoDecoderFFmpegHW_p.h
+++ b/src/QtAV/private/VideoDecoderFFmpegHW_p.h
@@ -32,7 +32,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT VideoDecoderFFmpegHWPrivate : public VideoDecoderPrivate
+class Q_AV_PRIVATE_EXPORT VideoDecoderFFmpegHWPrivate : public VideoDecoderPrivate
 {
 public:
     VideoDecoderFFmpegHWPrivate()
diff --git a/src/QtAV/private/VideoDecoder_p.h b/src/QtAV/private/VideoDecoder_p.h
index 445165b0..6246d07e 100644
--- a/src/QtAV/private/VideoDecoder_p.h
+++ b/src/QtAV/private/VideoDecoder_p.h
@@ -27,7 +27,7 @@
 namespace QtAV {
 
 
-class Q_AV_EXPORT VideoDecoderPrivate : public AVDecoderPrivate
+class Q_AV_PRIVATE_EXPORT VideoDecoderPrivate : public AVDecoderPrivate
 {
 public:
     VideoDecoderPrivate():
diff --git a/src/QtAV/private/VideoRenderer_p.h b/src/QtAV/private/VideoRenderer_p.h
index a4bcd1aa..539bc1e8 100644
--- a/src/QtAV/private/VideoRenderer_p.h
+++ b/src/QtAV/private/VideoRenderer_p.h
@@ -36,7 +36,7 @@ class QObject;
 class QWidget;
 namespace QtAV {
 class Filter;
-class Q_AV_EXPORT VideoRendererPrivate : public AVOutputPrivate
+class Q_AV_PRIVATE_EXPORT VideoRendererPrivate : public AVOutputPrivate
 {
 public:
     VideoRendererPrivate():
diff --git a/src/QtAV/private/VideoShader_p.h b/src/QtAV/private/VideoShader_p.h
index 028dc60a..ca7a2d20 100644
--- a/src/QtAV/private/VideoShader_p.h
+++ b/src/QtAV/private/VideoShader_p.h
@@ -39,7 +39,7 @@
 namespace QtAV {
 
 class VideoShader;
-class Q_AV_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
+class Q_AV_PRIVATE_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
 {
 public:
     VideoShaderPrivate()
diff --git a/src/libQtAV.pro b/src/libQtAV.pro
index 9a4102ff..9f1aed66 100644
--- a/src/libQtAV.pro
+++ b/src/libQtAV.pro
@@ -313,7 +313,6 @@ HEADERS *= \
     QtAV/AudioThread.h \
     QtAV/VideoThread.h \
     QtAV/ColorTransform.h \
-    QtAV/VideoOutputEventFilter.h \
     QtAV/VideoDecoderFFmpegHW.h \
     QtAV/private/factory.h \
     QtAV/private/singleton.h \
@@ -333,6 +332,7 @@ HEADERS *= \
     QtAV/private/VideoShader_p.h \
     QtAV/private/VideoDecoder_p.h \
     QtAV/private/VideoDecoderFFmpegHW_p.h \
+    QtAV/private/VideoOutputEventFilter.h \
     QtAV/private/VideoRenderer_p.h \
     QtAV/private/QPainterRenderer_p.h
 
diff --git a/templates/base_p.h b/templates/base_p.h
index 9aaf415f..c2883b60 100644
--- a/templates/base_p.h
+++ b/templates/base_p.h
@@ -7,7 +7,7 @@
 namespace QtAV {
 
 class %CLASS%;
-class Q_AV_EXPORT %CLASS%Private : public DPtrPrivate<%CLASS%>
+class Q_AV_PRIVATE_EXPORT %CLASS%Private : public DPtrPrivate<%CLASS%>
 {
 public:
     virtual ~%CLASS%Private() {}
diff --git a/templates/derived_p.h b/templates/derived_p.h
index 5fb557f2..7acb31a1 100644
--- a/templates/derived_p.h
+++ b/templates/derived_p.h
@@ -6,7 +6,7 @@
 
 namespace QtAV {
 
-class Q_AV_EXPORT %CLASS%Private : public %BASE%Private
+class Q_AV_PRIVATE_EXPORT %CLASS%Private : public %BASE%Private
 {
 public:
     virtual ~%CLASS%Private() {}