diff --git a/vpx/svc_context.h b/vpx/svc_context.h
index 8204f9cf5a7524b3a14875d92150c7b009cb2931..6c2367c4131bb94bf38259caa2184613dc1468b7 100644
--- a/vpx/svc_context.h
+++ b/vpx/svc_context.h
@@ -16,8 +16,8 @@
 #ifndef VPX_SVC_CONTEXT_H_
 #define VPX_SVC_CONTEXT_H_
 
-#include "vpx/vp8cx.h"
-#include "vpx/vpx_encoder.h"
+#include "./vp8cx.h"
+#include "./vpx_encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h
index c0424f1466a4bb406e91bc18eda4efdaf036a571..561496e1348ba88a29071b4549a7340b175d26b9 100644
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -15,7 +15,7 @@
  *
  * @{
  */
-#include "vp8.h"
+#include "./vp8.h"
 
 /*!\file
  * \brief Provides definitions for using the VP8 encoder algorithm within the
diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h
index 218f0b87afa210aa9ee5067d107a30f7b964a52b..a677f9e2e775595931713827f978107e99eeb5a3 100644
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -9,8 +9,6 @@
  */
 
 
-#include "vp8.h"
-
 /*!\defgroup vp8_decoder WebM VP8 Decoder
  * \ingroup vp8
  *
@@ -27,6 +25,9 @@
 extern "C" {
 #endif
 
+/* Include controls common to both the encoder and decoder */
+#include "./vp8.h"
+
 /*!\name Algorithm interface for VP8
  *
  * This interface provides the capability to decode raw VP8 streams, as would
@@ -41,9 +42,6 @@ extern vpx_codec_iface_t  vpx_codec_vp9_dx_algo;
 extern vpx_codec_iface_t *vpx_codec_vp9_dx(void);
 /*!@} - end algorithm interface member group*/
 
-/* Include controls common to both the encoder and decoder */
-#include "vp8.h"
-
 
 /*!\enum vp8_dec_control_id
  * \brief VP8 decoder control functions
diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h
index 3ea36d6ef168f08a28b6e1aee25cb8691d961719..2c4a2a0ca960a6b881cd0faf757957a3e87c1aa5 100644
--- a/vpx/vpx_codec.h
+++ b/vpx/vpx_codec.h
@@ -43,8 +43,8 @@
 extern "C" {
 #endif
 
-#include "vpx_integer.h"
-#include "vpx_image.h"
+#include "./vpx_integer.h"
+#include "./vpx_image.h"
 
   /*!\brief Decorator indicating a function is deprecated */
 #ifndef DEPRECATED
diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h
index 08f7f434e29ae4619c0cbcce26be6054e4252ef2..b97382ecd7bf3dcdbd40a620d3df3ab47a3f275d 100644
--- a/vpx/vpx_decoder.h
+++ b/vpx/vpx_decoder.h
@@ -29,8 +29,8 @@
 extern "C" {
 #endif
 
-#include "vpx_codec.h"
-#include "vpx_external_frame_buffer.h"
+#include "./vpx_codec.h"
+#include "./vpx_external_frame_buffer.h"
 
   /*!\brief Current ABI version number
    *
diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h
index 56752cfcfb5a3cd96c28c5b6117257036d23c693..4070694ab9c7ed91fcbfe0ed338e306d308e3a92 100644
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include "vpx_codec.h"
+#include "./vpx_codec.h"
 
   /*! Temporal Scalability: Maximum length of the sequence defining frame
    * layer membership
diff --git a/vpx/vpx_external_frame_buffer.h b/vpx/vpx_external_frame_buffer.h
index adf133042354f6c35b7dd65e48324a4000567aee..0b787b8f533670c32c7e604622eb2c45dc9f5857 100644
--- a/vpx/vpx_external_frame_buffer.h
+++ b/vpx/vpx_external_frame_buffer.h
@@ -15,7 +15,7 @@
 extern "C" {
 #endif
 
-#include "vpx/vpx_integer.h"
+#include "./vpx_integer.h"
 
 /*!\brief External frame buffer
  *