We can replace system includes with git-compat-util.h (and should make sure it is included in all .c files). We can drop includes from headers entirely, as every .c file is supposed to include git-compat-util itself first.
We also use the full "sha1dc/" path for including related files. This isn't strictly necessary, but makes the expected resolution more obvious. Signed-off-by: Jeff King <p...@peff.net> --- sha1dc/sha1.c | 9 +++------ sha1dc/sha1.h | 2 -- sha1dc/ubc_check.c | 4 ++-- sha1dc/ubc_check.h | 2 -- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c index ed2010911..762c6fff8 100644 --- a/sha1dc/sha1.c +++ b/sha1dc/sha1.c @@ -5,12 +5,9 @@ * https://opensource.org/licenses/MIT ***/ -#include <string.h> -#include <memory.h> -#include <stdio.h> - -#include "sha1.h" -#include "ubc_check.h" +#include "git-compat-util.h" +#include "sha1dc/sha1.h" +#include "sha1dc/ubc_check.h" #define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n)))) #define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n)))) diff --git a/sha1dc/sha1.h b/sha1dc/sha1.h index 8b522f9d2..ce5390397 100644 --- a/sha1dc/sha1.h +++ b/sha1dc/sha1.h @@ -5,8 +5,6 @@ * https://opensource.org/licenses/MIT ***/ -#include <stdint.h> - // uses SHA-1 message expansion to expand the first 16 words of W[] to 80 words void sha1_message_expansion(uint32_t W[80]); diff --git a/sha1dc/ubc_check.c b/sha1dc/ubc_check.c index 556aaf3c5..6bccd4f2b 100644 --- a/sha1dc/ubc_check.c +++ b/sha1dc/ubc_check.c @@ -22,8 +22,8 @@ // a directly verifiable version named ubc_check_verify can be found in ubc_check_verify.c // ubc_check has been verified against ubc_check_verify using the 'ubc_check_test' program in the tools section -#include <stdint.h> -#include "ubc_check.h" +#include "git-compat-util.h" +#include "sha1dc/ubc_check.h" static const uint32_t DV_I_43_0_bit = (uint32_t)(1) << 0; static const uint32_t DV_I_44_0_bit = (uint32_t)(1) << 1; diff --git a/sha1dc/ubc_check.h b/sha1dc/ubc_check.h index 27285bdf5..05ff944eb 100644 --- a/sha1dc/ubc_check.h +++ b/sha1dc/ubc_check.h @@ -21,8 +21,6 @@ #ifndef UBC_CHECK_H #define UBC_CHECK_H -#include <stdint.h> - #define DVMASKSIZE 1 typedef struct { int dvType; int dvK; int dvB; int testt; int maski; int maskb; uint32_t dm[80]; } dv_info_t; extern dv_info_t sha1_dvs[]; -- 2.12.0.rc2.629.ga7951ed82
