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

diff --cc apply.h
index 78c8bcfc3c4afe5ebd583f58c76eb3ca0e19a702,0b70e1f3f5c283f3f2ef778c84443cc57febc717..59483481330c61033d56e363f70dff08f4d689af
--- 1/apply.h
--- 2/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 75b9a86066b5f4e2977c9525b222c6595cef8b25,7aba1336352c127e6b7791facd5247532e3668f8..d4f97a00f541c66b694ff00340ead218752bf37e
--- 1/archive.h
--- 2/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;

diff --cc attr.h
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc config.h
Simple merge

diff --cc convert.h
Simple merge

diff --cc diffcore.h
Simple merge

diff --cc environment.c
Simple merge

diff --cc object-store.h
Simple merge

diff --cc repository.h
Simple merge

diff --cc revision.h
Simple merge

diff --cc submodule.h
Simple merge

diff --cc unpack-trees.h
Simple merge

diff --cc utf8.h
Simple merge