diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h
index 19a9729db7..14ca344a79 100644
--- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h
+++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h
@@ -18,7 +18,6 @@
 #include "../../video_capture_impl.h"
 #include "video_capture_qtkit_utility.h"
 #include "../../device_info_impl.h"
-#include "vplib.h"
 
 
 // Forward declaraion
diff --git a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc
index 6889a8ca7b..f7d8f2e29d 100644
--- a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc
+++ b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc
@@ -21,7 +21,6 @@
 #include "thread_wrapper.h"
 #include "tick_util.h"
 #include "trace.h"
-#include "vplib.h"
 #include <unistd.h>
 
 namespace webrtc
diff --git a/src/modules/video_capture/main/source/Windows/sink_filter_windows.cc b/src/modules/video_capture/main/source/Windows/sink_filter_windows.cc
index 9ee582d92e..4da618319b 100644
--- a/src/modules/video_capture/main/source/Windows/sink_filter_windows.cc
+++ b/src/modules/video_capture/main/source/Windows/sink_filter_windows.cc
@@ -10,7 +10,6 @@
 
 #include "sink_filter_windows.h"
 
-#include "vplib.h"
 #include "trace.h"
 #include "help_functions_windows.h"
 
diff --git a/src/modules/video_render/main/source/Android/video_render_android_native_opengl2.cc b/src/modules/video_render/main/source/Android/video_render_android_native_opengl2.cc
index ad640bce87..a6d7133ab3 100644
--- a/src/modules/video_render/main/source/Android/video_render_android_native_opengl2.cc
+++ b/src/modules/video_render/main/source/Android/video_render_android_native_opengl2.cc
@@ -10,7 +10,6 @@
 
 #include "video_render_android_native_opengl2.h"
 #include "critical_section_wrapper.h"
-#include "vplib.h"
 #include "tick_util.h"
 
 #ifdef ANDROID_LOG
diff --git a/src/modules/video_render/main/source/linux/video_x11_channel.cc b/src/modules/video_render/main/source/linux/video_x11_channel.cc
index e041b95f2e..84686f8261 100644
--- a/src/modules/video_render/main/source/linux/video_x11_channel.cc
+++ b/src/modules/video_render/main/source/linux/video_x11_channel.cc
@@ -23,12 +23,12 @@ static int dispCount = 0;
 
 
 VideoX11Channel::VideoX11Channel(WebRtc_Word32 id) :
-    _crit(*CriticalSectionWrapper::CreateCriticalSection()),
-            _videoInterpolator(NULL), _display(NULL), _shminfo(),
-            _image(NULL), _window(0L), _width(DEFAULT_RENDER_FRAME_WIDTH),
-            _height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
-            _xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),
-            _Id(id)
+    _crit(*CriticalSectionWrapper::CreateCriticalSection()), _display(NULL),
+          _shminfo(), _image(NULL), _window(0L),
+          _width(DEFAULT_RENDER_FRAME_WIDTH),
+          _height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
+          _xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),
+          _Id(id)
 {
 }
 
@@ -41,11 +41,6 @@ VideoX11Channel::~VideoX11Channel()
         _crit.Leave();
     }
     delete &_crit;
-
-    if (_videoInterpolator)
-    {
-        delete _videoInterpolator;
-    }
 }
 
 WebRtc_Word32 VideoX11Channel::RenderFrame(const WebRtc_UWord32 streamId,
diff --git a/src/modules/video_render/main/source/linux/video_x11_channel.h b/src/modules/video_render/main/source/linux/video_x11_channel.h
index 77d4f73a2d..4c47c54334 100644
--- a/src/modules/video_render/main/source/linux/video_x11_channel.h
+++ b/src/modules/video_render/main/source/linux/video_x11_channel.h
@@ -13,7 +13,6 @@
 
 #include "video_render_defines.h"
 #include "vplib.h"
-
 #include <sys/shm.h>
 
 #include <X11/Xlib.h>
@@ -26,7 +25,6 @@ class CriticalSectionWrapper;
 #define DEFAULT_RENDER_FRAME_WIDTH 352
 #define DEFAULT_RENDER_FRAME_HEIGHT 288
 
-typedef char* VideoInterpolator;
 
 class VideoX11Channel: public VideoRenderCallback
 {
@@ -62,12 +60,12 @@ private:
             CreateLocalRenderer(WebRtc_Word32 width, WebRtc_Word32 height);
     WebRtc_Word32 RemoveRenderer();
 
-    //FIXME a better place for this method? the GetWidthHeight no longer supported by vplib.
+    //FIXME a better place for this method? the GetWidthHeight no longer
+    // supported by common_video.
     int GetWidthHeight(VideoType type, int bufferSize, int& width,
                        int& height);
 
     CriticalSectionWrapper& _crit;
-    VideoInterpolator* _videoInterpolator;
 
     Display* _display;
     XShmSegmentInfo _shminfo;
diff --git a/src/modules/video_render/main/source/windows/video_render_directdraw.cc b/src/modules/video_render/main/source/windows/video_render_directdraw.cc
index 64a4e246d5..f1427e75af 100644
--- a/src/modules/video_render/main/source/windows/video_render_directdraw.cc
+++ b/src/modules/video_render/main/source/windows/video_render_directdraw.cc
@@ -22,7 +22,6 @@ DEFINE_GUID( IID_IDirectDraw7,0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,
 #include "trace.h"
 #include "critical_section_wrapper.h"
 //#include "VideoErrors.h"
-#include "vplib.h"
 
 // Added
 #include "module_common_types.h"