From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 19:41:32 +0000 (-0700)
Subject: Merge branch 'en/incl-forward-decl'
X-Git-Tag: v2.19.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5ade03446430f1190fdf1eca8b8fde5f63367110

Merge branch 'en/incl-forward-decl'

Code hygiene improvement for the header files.

* en/incl-forward-decl:
Remove forward declaration of an enum
compat/precompose_utf8.h: use more common include guard style
urlmatch.h: fix include guard
Move definition of enum branch_track from cache.h to branch.h
alloc: make allocate_alloc_state and clear_alloc_state more consistent
Add missing includes and forward declarations
---

5ade03446430f1190fdf1eca8b8fde5f63367110
diff --cc apply.h
index 78c8bcfc3c,0b70e1f3f5..5948348133
--- a/apply.h
+++ b/apply.h
@@@ -1,8 -1,9 +1,11 @@@
  #ifndef APPLY_H
  #define APPLY_H
  
+ #include "lockfile.h"
+ #include "string-list.h"
+ 
 +struct repository;
 +
  enum apply_ws_error_action {
  	nowarn_ws_error,
  	warn_on_ws_error,
diff --cc archive.h
index 75b9a86066,7aba133635..d4f97a00f5
--- a/archive.h
+++ b/archive.h
@@@ -1,12 -1,10 +1,13 @@@
  #ifndef ARCHIVE_H
  #define ARCHIVE_H
  
+ #include "cache.h"
  #include "pathspec.h"
  
 +struct repository;
 +
  struct archiver_args {
 +	struct repository *repo;
  	const char *base;
  	size_t baselen;
  	struct tree *tree;