From 3b70645597bea052d2398005bc723212aeea6875 Mon Sep 17 00:00:00 2001
From: Anton Mitrofanov <BugMaster@narod.ru>
Date: Wed, 13 Apr 2016 21:54:25 +0300
Subject: [PATCH] Clean up header includes

---
 common/common.c     | 1 -
 common/common.h     | 6 ++++++
 common/cpu.c        | 1 -
 common/macroblock.c | 1 -
 common/ppc/mc.c     | 8 --------
 common/ppc/pixel.c  | 1 -
 common/ppc/quant.h  | 2 +-
 common/x86/mc-c.c   | 4 ----
 encoder/me.h        | 6 ------
 9 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/common/common.c b/common/common.c
index 4b8f803a..607aefdd 100644
--- 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 c5d48736..3a74c9e7 100644
--- 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 1c9894d7..135bb5e6 100644
--- 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 9c05f005..081683cd 100644
--- 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 8df28945..e1691664 100644
--- 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 dde7481e..5ace7255 100644
--- 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 15ef4af0..5335e5e6 100644
--- 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 0019f430..11e481e1 100644
--- 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 ce041aa6..06a54275 100644
--- 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 )
-- 
2.39.2