Resolve dspr2 loop filter dependency complexity

Narrow the scope of dependency required by the dspr2 implementation
of loop filters.

Change-Id: Ib8d99dc7d9c231f69dd31d02e0a89e5bd0545a28

vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c

@@ -11,13 +11,12 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_loopfilter.h"
-#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx/vpx_integer.h"
 #include "vpx_dsp/mips/common_dspr2.h"
+#include "vpx_mem/vpx_mem.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_4_dspr2(unsigned char *s,

vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h

@@ -14,9 +14,9 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
+#include "vpx/vpx_integer.h"
+#include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_onyxc_int.h"
 
 #ifdef __cplusplus
 extern "C" {

vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h

@@ -14,8 +14,8 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_onyxc_int.h"
+#include "vpx/vpx_integer.h"
+#include "vpx_mem/vpx_mem.h"
 
 #ifdef __cplusplus
 extern "C" {

vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h

@@ -14,8 +14,8 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_onyxc_int.h"
+#include "vpx/vpx_integer.h"
+#include "vpx_mem/vpx_mem.h"
 
 #ifdef __cplusplus
 extern "C" {

vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c

@@ -11,13 +11,12 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_loopfilter.h"
-#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx/vpx_integer.h"
 #include "vpx_dsp/mips/common_dspr2.h"
+#include "vpx_mem/vpx_mem.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_8_dspr2(unsigned char *s,

vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c

@@ -11,13 +11,12 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_loopfilter.h"
-#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx/vpx_integer.h"
 #include "vpx_dsp/mips/common_dspr2.h"
+#include "vpx_mem/vpx_mem.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_horizontal_16_dspr2(unsigned char *s,

vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c

@@ -11,13 +11,12 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_loopfilter.h"
-#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h"
 #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h"
+#include "vpx/vpx_integer.h"
 #include "vpx_dsp/mips/common_dspr2.h"
+#include "vpx_mem/vpx_mem.h"
 
 #if HAVE_DSPR2
 void vp9_lpf_vertical_16_dspr2(uint8_t *s,