diff --git a/src/mpeg2.c b/src/mpeg2.c
index 3b0421c..f397ea3 100644
--- a/src/mpeg2.c
+++ b/src/mpeg2.c
@@ -23,8 +23,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "context.h"
 #include "sunxi_cedrus.h"
 #include "mpeg2.h"
+#include "surface.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/mpeg2.h b/src/mpeg2.h
index e665cf5..fd3e3fa 100644
--- a/src/mpeg2.h
+++ b/src/mpeg2.h
@@ -26,14 +26,10 @@
 #ifndef _MPEG2_H_
 #define _MPEG2_H_
 
-#include <va/va_backend.h>
-
-#include "context.h"
-#include "buffer.h"
-
-#include "surface.h"
+struct object_surface;
+struct sunxi_cedrus_driver_data;
 
 int mpeg2_set_controls(struct sunxi_cedrus_driver_data *driver_data,
-	struct object_surface *surface_object);
+		       struct object_surface *surface_object);
 
 #endif