diff --git a/examples/example_xma.c b/examples/example_xma.c
index 0e33ff46f..c960c2846 100644
--- a/examples/example_xma.c
+++ b/examples/example_xma.c
@@ -27,7 +27,7 @@ static int   verbose = 0;
 
 static const struct {
   const char *name;
-  const vpx_codec_iface_t *iface;
+  vpx_codec_iface_t *iface;
 } ifaces[] = {
 #if CONFIG_VP9_DECODER
   {"vp9",  &vpx_codec_vp8_dx_algo},
diff --git a/test/codec_factory.h b/test/codec_factory.h
index 38c4d29a0..80e87c883 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -71,7 +71,7 @@ class VP8Decoder : public Decoder {
       : Decoder(cfg, deadline) {}
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const {
+  virtual vpx_codec_iface_t* CodecInterface() const {
 #if CONFIG_VP8_DECODER
     return &vpx_codec_vp8_dx_algo;
 #else
@@ -87,7 +87,7 @@ class VP8Encoder : public Encoder {
       : Encoder(cfg, deadline, init_flags, stats) {}
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const {
+  virtual vpx_codec_iface_t* CodecInterface() const {
 #if CONFIG_VP8_ENCODER
     return &vpx_codec_vp8_cx_algo;
 #else
@@ -153,7 +153,7 @@ class VP9Decoder : public Decoder {
       : Decoder(cfg, deadline) {}
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const {
+  virtual vpx_codec_iface_t* CodecInterface() const {
 #if CONFIG_VP9_DECODER
     return &vpx_codec_vp9_dx_algo;
 #else
@@ -169,7 +169,7 @@ class VP9Encoder : public Encoder {
       : Encoder(cfg, deadline, init_flags, stats) {}
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const {
+  virtual vpx_codec_iface_t* CodecInterface() const {
 #if CONFIG_VP9_ENCODER
     return &vpx_codec_vp9_cx_algo;
 #else
diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index ddaed9fa0..3e8ff724b 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -77,7 +77,7 @@ class Decoder {
   }
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const = 0;
+  virtual vpx_codec_iface_t* CodecInterface() const = 0;
 
   void InitOnce() {
     if (!init_done_) {
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index dbdc33c8e..4dabcd5b4 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -128,7 +128,7 @@ class Encoder {
   }
 
  protected:
-  virtual const vpx_codec_iface_t* CodecInterface() const = 0;
+  virtual vpx_codec_iface_t* CodecInterface() const = 0;
 
   const char *EncoderError() {
     const char *detail = vpx_codec_error_detail(&encoder_);
diff --git a/vpxdec.c b/vpxdec.c
index cde46e9a7..6d5ca2469 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -39,7 +39,7 @@ static const char *exec_name;
 
 static const struct {
   char const *name;
-  const vpx_codec_iface_t *(*iface)(void);
+  vpx_codec_iface_t *(*iface)(void);
   uint32_t fourcc;
 } ifaces[] = {
 #if CONFIG_VP8_DECODER
diff --git a/vpxenc.c b/vpxenc.c
index f772432ad..6ad3b9bd6 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -62,8 +62,8 @@ static const char *exec_name;
 
 static const struct codec_item {
   char const              *name;
-  const vpx_codec_iface_t *(*iface)(void);
-  const vpx_codec_iface_t *(*dx_iface)(void);
+  vpx_codec_iface_t *(*iface)(void);
+  vpx_codec_iface_t *(*dx_iface)(void);
   unsigned int             fourcc;
 } codecs[] = {
 #if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER