diff --git a/.gitignore b/.gitignore
index c3af32229401..de9eed200a4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,8 @@ bld/
 *.VisualState.xml
 TestResult.xml
 
+*.o
+*.a
 *_i.c
 *_p.c
 *_i.h
diff --git a/drivers/webp/dec/decode_vp8.h b/drivers/webp/dec/decode_vp8.h
index 12c77bcbf6eb..c26a9fc8914e 100644
--- a/drivers/webp/dec/decode_vp8.h
+++ b/drivers/webp/dec/decode_vp8.h
@@ -12,7 +12,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_
 
-#include "../webp/decode.h"
+#include "../decode.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/dec/webp.c b/drivers/webp/dec/webp.c
index edd348cbe70c..f44bc2b8ae26 100644
--- a/drivers/webp/dec/webp.c
+++ b/drivers/webp/dec/webp.c
@@ -14,7 +14,7 @@
 #include "./vp8i.h"
 #include "./vp8li.h"
 #include "./webpi.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/mux/demux.c b/drivers/webp/mux/demux.c
index 4519f7d55bcc..501d08f41d8b 100644
--- a/drivers/webp/mux/demux.c
+++ b/drivers/webp/mux/demux.c
@@ -8,13 +8,13 @@
 //  WebP container demux.
 //
 
-#include "../webp/mux.h"
+#include "../mux.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "../webp/decode.h"  // WebPGetInfo
-#include "../webp/format_constants.h"
+#include "../decode.h"  // WebPGetInfo
+#include "../format_constants.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/drivers/webp/mux/muxi.h b/drivers/webp/mux/muxi.h
index edd8c368cd24..2f06f3ed03a0 100644
--- a/drivers/webp/mux/muxi.h
+++ b/drivers/webp/mux/muxi.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 #include "../dec/vp8i.h"
 #include "../dec/vp8li.h"
-#include "../webp/format_constants.h"
-#include "../webp/mux.h"
+#include "../format_constants.h"
+#include "../mux.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {