Clean up header includes

diff --git a/common/common.c b/common/common.c
index 4b8f803a839e530fff09ec06571f5ba59f3b76d1..607aefdd160b9dc22eee9c1d13696bb54832a37f 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -26,7 +26,6 @@
 
 #include "common.h"
 
-#include <stdarg.h>
 #include <ctype.h>
 
 #if HAVE_MALLOC_H

diff --git a/common/common.h b/common/common.h
index c5d48736d289e1bb25336366ce6014c4b6234132..3a74c9e7bb60d09208ff46c9b2603f0aee804342 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -973,6 +973,12 @@ struct x264_t
 #endif
 };
 
+typedef struct
+{
+    int sad;
+    int16_t mv[2];
+} mvsad_t;
+
 // included at the end because it needs x264_t
 #include "macroblock.h"
 

diff --git a/common/cpu.c b/common/cpu.c
index 1c9894d70c9354826f24f432b573597235119479..135bb5e60472d4ba6e4603e434c54890b8732507 100644 (file)
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -26,7 +26,6 @@
  *****************************************************************************/
 
 #include "common.h"
-#include "cpu.h"
 
 #if HAVE_POSIXTHREAD && SYS_LINUX
 #include <sched.h>

diff --git a/common/macroblock.c b/common/macroblock.c
index 9c05f005e13bad609786a36670aeec6e3c5d9108..081683cd58088731654f3e629f3ef7e36e7da95a 100644 (file)
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -27,7 +27,6 @@
  *****************************************************************************/
 
 #include "common.h"
-#include "encoder/me.h"
 
 #define MC_LUMA(list,p) \
     h->mc.mc_luma( &h->mb.pic.p_fdec[p][4*y*FDEC_STRIDE+4*x], FDEC_STRIDE, \

diff --git a/common/ppc/mc.c b/common/ppc/mc.c
index 8df289457cab6579039b65a8fe5666414c6c3c5e..e169166436a294b01e182448259b0e0173c2af89 100644 (file)
--- a/common/ppc/mc.c
+++ b/common/ppc/mc.c
@@ -24,15 +24,7 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdarg.h>
-
-#include "x264.h"
 #include "common/common.h"
-#include "common/mc.h"
 #include "mc.h"
 #include "ppccommon.h"
 

diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
index dde7481e69ff7f33684dbee671e4dcb49b15b451..5ace7255b871d9a29574c3a023df9f09d2235942 100644 (file)
--- a/common/ppc/pixel.c
+++ b/common/ppc/pixel.c
@@ -26,7 +26,6 @@
 
 #include "common/common.h"
 #include "ppccommon.h"
-#include "../predict.h"
 
 #if !HIGH_BIT_DEPTH
 /***********************************************************************

diff --git a/common/ppc/quant.h b/common/ppc/quant.h
index 15ef4af0553a09d5ad694eebd60f5f66eef2cadf..5335e5e67312798084efd1fe81b39e054a87a246 100644 (file)
--- a/common/ppc/quant.h
+++ b/common/ppc/quant.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * quant.c: ppc quantization
+ * quant.h: ppc quantization
  *****************************************************************************
  * Copyright (C) 2007-2016 x264 project
  *

diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c
index 0019f430245c60693e55e9dc3938b69c8a9c25a8..11e481e1f1b429b1d4889cd03f3c102c1489d000 100644 (file)
--- a/common/x86/mc-c.c
+++ b/common/x86/mc-c.c
@@ -25,10 +25,6 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "common/common.h"
 #include "mc.h"
 

diff --git a/encoder/me.h b/encoder/me.h
index ce041aa66a50af9bb1b701be385067103fd8efea..06a542750996a2da2f465cc552ea8dc3969c2276 100644 (file)
--- a/encoder/me.h
+++ b/encoder/me.h
@@ -55,12 +55,6 @@ typedef struct
     ALIGNED_4( int16_t mv[2] );
 } ALIGNED_16( x264_me_t );
 
-typedef struct
-{
-    int sad;
-    int16_t mv[2];
-} mvsad_t;
-
 void x264_me_search_ref( x264_t *h, x264_me_t *m, int16_t (*mvc)[2], int i_mvc, int *p_fullpel_thresh );
 #define x264_me_search( h, m, mvc, i_mvc )\
     x264_me_search_ref( h, m, mvc, i_mvc, NULL )