Index: pjproject/trunk/third_party/BaseClasses/amfilter.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/amfilter.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/amfilter.cpp	(revision 4072)
@@ -27,4 +27,8 @@
 //=====================================================================
 //=====================================================================
+
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -5357,2 +5361,3 @@
 #pragma warning(disable:4514)
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/amvideo.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/amvideo.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/amvideo.cpp	(revision 4072)
@@ -8,4 +8,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -274,2 +277,4 @@
     return COLORS(pVideoInfo);
 }
+
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/arithutil.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/arithutil.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/arithutil.cpp	(revision 4072)
@@ -7,4 +7,8 @@
 // Copyright (c) 1992-2004 Microsoft Corporation.  All rights reserved.
 //------------------------------------------------------------------------------
+
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -359,2 +363,4 @@
                     (LONGLONG)uliResult.QuadPart;
 }
+
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/combase.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/combase.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/combase.cpp	(revision 4072)
@@ -8,4 +8,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -264,2 +267,3 @@
 }
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/ctlutil.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/ctlutil.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/ctlutil.cpp	(revision 4072)
@@ -13,4 +13,7 @@
 // renderers and transforms to pass by IMediaPosition and IMediaSeeking
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -2540,2 +2543,3 @@
 }
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/mtype.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/mtype.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/mtype.cpp	(revision 4072)
@@ -8,4 +8,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 // helper class that derived pin objects can use to compare media
@@ -477,2 +480,4 @@
 // eliminate very many spurious warnings from MS compiler
 #pragma warning(disable:4514)
+
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/renbase.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/renbase.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/renbase.cpp	(revision 4072)
@@ -7,4 +7,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>        // DirectShow base class definitions
@@ -2857,2 +2860,3 @@
 #pragma warning(disable: 4514)
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/wxdebug.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/wxdebug.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/wxdebug.cpp	(revision 4072)
@@ -8,4 +8,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #define _WINDLL
@@ -1473,2 +1476,3 @@
 #endif
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/wxlist.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/wxlist.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/wxlist.cpp	(revision 4072)
@@ -7,4 +7,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 /* A generic list of pointers to objects.
@@ -890,2 +893,4 @@
 
 } // Reverse
+
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
Index: pjproject/trunk/third_party/BaseClasses/wxutil.cpp
===================================================================
--- pjproject/trunk/third_party/BaseClasses/wxutil.cpp	(revision 4062)
+++ pjproject/trunk/third_party/BaseClasses/wxutil.cpp	(revision 4072)
@@ -8,4 +8,7 @@
 //------------------------------------------------------------------------------
 
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
 
 #include <streams.h>
@@ -768,2 +771,3 @@
 
 
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
