Remove webrtc/modules/video_{capture,render}/include

webrtc/modules/video_render/video_render.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_
-#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_
+#ifndef WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_
+#define WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_
 
 /*
  * video_render.h
  *
  * This header file together with module.h and module_common_types.h
  * contains all of the APIs that are needed for using the video render
  * module class.
  *
  */
 
 #include "webrtc/modules/include/module.h"
-#include "webrtc/modules/video_render/include/video_render_defines.h"
+#include "webrtc/modules/video_render/video_render_defines.h"
 
 namespace webrtc {
 
 // Class definitions
 class VideoRender: public Module
 {
 public:
     /*
      *   Create a video render module object
      *
@@ skipping 223 matching lines @@
                                   const VideoFrame& videoFrame) = 0;
 
     /*
      * Set a timout image. The image is rendered if no videoframe has been delivered
      */
     virtual int32_t SetTimeoutImage(const uint32_t streamId,
                                     const VideoFrame& videoFrame,
                                     const uint32_t timeout) = 0;
 };
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_
+#endif  // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_