diff --git a/examples/decoder_tmpl.c b/examples/decoder_tmpl.c
index 597fea200..3e55352ea 100644
--- a/examples/decoder_tmpl.c
+++ b/examples/decoder_tmpl.c
@@ -12,14 +12,14 @@
 /*
 @*INTRODUCTION
  */
-#include "vpx_config.h"
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "vpx/vpx_decoder.h"
+#include "./vpx_config.h"
 #include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
 #define interface (vpx_codec_vp8_dx())
 @EXTRA_INCLUDES
 
diff --git a/vpx/vp8.h b/vpx/vp8.h
index ff7150328..57d3cae26 100644
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 /*!\defgroup vp8 VP8
  * \ingroup codecs
  * VP8 is vpx's newest video compression algorithm that uses motion
@@ -31,6 +30,9 @@
 #ifndef VP8_H
 #define VP8_H
 
+#include "./vpx_codec.h"
+#include "./vpx_image.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif