Add missing includes and forward declarations

I looped over the toplevel header files, creating a temporary two-line C
program for each consisting of
#include "git-compat-util.h"
#include $HEADER
This patch is the result of manually fixing errors in compiling those
tiny programs.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/alloc.h b/alloc.h
index 3e4e828db48e2be2dff993d01175d7bf8c41c8f0..7a41bb9eb338c78fee221220b94f91387ac04503 100644 (file)
--- a/alloc.h
+++ b/alloc.h
@@ -1,9 +1,11 @@
 #ifndef ALLOC_H
 #define ALLOC_H
 
 #ifndef ALLOC_H
 #define ALLOC_H
 

+struct alloc_state;

 struct tree;
 struct commit;
 struct tag;
 struct tree;
 struct commit;
 struct tag;

+struct repository;

 
 void *alloc_blob_node(struct repository *r);
 void *alloc_tree_node(struct repository *r);
 
 void *alloc_blob_node(struct repository *r);
 void *alloc_tree_node(struct repository *r);

diff --git a/apply.h b/apply.h
index b80d8ba73633c042989e52a00f7df8ee3afcd192..0b70e1f3f5c283f3f2ef778c84443cc57febc717 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -1,6 +1,9 @@
 #ifndef APPLY_H
 #define APPLY_H
 
 #ifndef APPLY_H
 #define APPLY_H
 

+#include "lockfile.h"
+#include "string-list.h"
+

 enum apply_ws_error_action {
        nowarn_ws_error,
        warn_on_ws_error,
 enum apply_ws_error_action {
        nowarn_ws_error,
        warn_on_ws_error,

diff --git a/archive.h b/archive.h
index 1f9954f7cdc5a1ee8036321e439a65bdfb90e59f..7aba1336352c127e6b7791facd5247532e3668f8 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -1,6 +1,7 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 

+#include "cache.h"

 #include "pathspec.h"
 
 struct archiver_args {
 #include "pathspec.h"
 
 struct archiver_args {

diff --git a/attr.h b/attr.h
index 442d464db6271da48a4ef133127c7d3a18c186cf..3185538bda31cadeefe2ffcd87a831148760843b 100644 (file)
--- a/attr.h
+++ b/attr.h
@@ -7,6 +7,7 @@ struct git_attr;
 /* opaque structures used internally for attribute collection */
 struct all_attrs_item;
 struct attr_stack;
 /* opaque structures used internally for attribute collection */
 struct all_attrs_item;
 struct attr_stack;

+struct index_state;

 
 /*
  * Given a string, return the gitattribute object that
 
 /*
  * Given a string, return the gitattribute object that

diff --git a/bisect.h b/bisect.h
index a5d9248a47675194e7e0d16aed37018cbb67eb33..34df20935123065b4b253288ea0e22b1721af0e9 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -1,6 +1,8 @@
 #ifndef BISECT_H
 #define BISECT_H
 
 #ifndef BISECT_H
 #define BISECT_H
 

+struct commit_list;
+

 /*
  * Find bisection. If something is found, `reaches` will be the number of
  * commits that the best commit reaches. `all` will be the count of
 /*
  * Find bisection. If something is found, `reaches` will be the number of
  * commits that the best commit reaches. `all` will be the count of

diff --git a/branch.h b/branch.h
index 473d0a93e910d8f053e6e8c919e430048a3033a0..7d9b330ebabacb70ae428a92a7e4487116e91f54 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -1,6 +1,8 @@
 #ifndef BRANCH_H
 #define BRANCH_H
 
 #ifndef BRANCH_H
 #define BRANCH_H
 

+struct strbuf;
+

 /* Functions for acting on the information about branches. */
 
 /*
 /* Functions for acting on the information about branches. */
 
 /*

diff --git a/bulk-checkin.h b/bulk-checkin.h
index a85527318b15b36bb60b0b6b166569b4fcaa9dcf..f438f93811bfc62aa79a9ba6f9476240100e286f 100644 (file)
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -4,6 +4,8 @@
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 

+#include "cache.h"
+

 extern int index_bulk_checkin(struct object_id *oid,
                              int fd, size_t size, enum object_type type,
                              const char *path, unsigned flags);
 extern int index_bulk_checkin(struct object_id *oid,
                              int fd, size_t size, enum object_type type,
                              const char *path, unsigned flags);

diff --git a/column.h b/column.h
index 0a61917fa75484622e39ef54bfbc7d8a43b059ed..2567a5cf4dff99bcaf0e507168e1d4cbaba05bce 100644 (file)
--- a/column.h
+++ b/column.h
@@ -36,6 +36,7 @@ static inline int column_active(unsigned int colopts)
        return (colopts & COL_ENABLE_MASK) == COL_ENABLED;
 }
 
        return (colopts & COL_ENABLE_MASK) == COL_ENABLED;
 }
 

+struct string_list;

 extern void print_columns(const struct string_list *list, unsigned int colopts,
                          const struct column_options *opts);
 
 extern void print_columns(const struct string_list *list, unsigned int colopts,
                          const struct column_options *opts);
 

diff --git a/commit-graph.h b/commit-graph.h
index 76e098934a7f6740b52a479baa5c68fe605d1ea6..eea62f8c0ee53b56630a1a2b0c2c716b4cd63670 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "repository.h"
 #include "string-list.h"
 #include "git-compat-util.h"
 #include "repository.h"
 #include "string-list.h"

+#include "cache.h"

 
 struct commit;
 
 
 struct commit;
 

diff --git a/config.h b/config.h
index bb2f506b27137e8d66ab4cd96439143dced94780..75ba1d45ffa2e0d8b5cca3fd18a9531f47744ea4 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,6 +1,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
 #ifndef CONFIG_H
 #define CONFIG_H
 

+#include "hashmap.h"
+#include "string-list.h"
+
+struct object_id;
+

 /* git_config_parse_key() returns these negated: */
 #define CONFIG_INVALID_KEY 1
 #define CONFIG_NO_SECTION_OR_NAME 2
 /* git_config_parse_key() returns these negated: */
 #define CONFIG_INVALID_KEY 1
 #define CONFIG_NO_SECTION_OR_NAME 2

diff --git a/connected.h b/connected.h
index 322dc7637263630712e5ab3e875720c5e39eda22..e4c961817d33f64286d3415b370e6a297e381559 100644 (file)
--- a/connected.h
+++ b/connected.h
@@ -1,6 +1,7 @@
 #ifndef CONNECTED_H
 #define CONNECTED_H
 
 #ifndef CONNECTED_H
 #define CONNECTED_H
 

+struct object_id;

 struct transport;
 
 /*
 struct transport;
 
 /*

diff --git a/convert.h b/convert.h
index 01385d92886223ab7b1d951d12c5de9b07612401..76c654385d813bfc72b9be44a11272ff9b87228f 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -7,6 +7,8 @@
 #include "string-list.h"
 
 struct index_state;
 #include "string-list.h"
 
 struct index_state;

+struct object_id;
+struct strbuf;

 
 #define CONV_EOL_RNDTRP_DIE   (1<<0) /* Die if CRLF to LF to CRLF is different */
 #define CONV_EOL_RNDTRP_WARN  (1<<1) /* Warn if CRLF to LF to CRLF is different */
 
 #define CONV_EOL_RNDTRP_DIE   (1<<0) /* Die if CRLF to LF to CRLF is different */
 #define CONV_EOL_RNDTRP_WARN  (1<<1) /* Warn if CRLF to LF to CRLF is different */

diff --git a/csum-file.h b/csum-file.h
index c5a2e335e7e063528da8386cc95fba4f7bb5bfe8..3bf7184736365c2034b6851ca4a1f3c9d052cb42 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -1,6 +1,8 @@
 #ifndef CSUM_FILE_H
 #define CSUM_FILE_H
 
 #ifndef CSUM_FILE_H
 #define CSUM_FILE_H
 

+#include "hash.h"
+

 struct progress;
 
 /* A SHA1-protected file */
 struct progress;
 
 /* A SHA1-protected file */

diff --git a/diffcore.h b/diffcore.h
index a30da161dafcf0d3951e3208000c54388803c8f0..0dd1e9a63a05de7774ebdea4f2236ce584c32d0c 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -4,6 +4,10 @@
 #ifndef DIFFCORE_H
 #define DIFFCORE_H
 
 #ifndef DIFFCORE_H
 #define DIFFCORE_H
 

+#include "cache.h"
+
+struct diff_options;
+

 /* This header file is internal between diff.c and its diff transformers
  * (e.g. diffcore-rename, diffcore-pickaxe).  Never include this header
  * in anything else.
 /* This header file is internal between diff.c and its diff transformers
  * (e.g. diffcore-rename, diffcore-pickaxe).  Never include this header
  * in anything else.

diff --git a/dir-iterator.h b/dir-iterator.h
index 27739e6c29560492254c7fb7e22170cd1ff327ba..970793d07a1d72761159adca51d16859c7b72a29 100644 (file)
--- a/dir-iterator.h
+++ b/dir-iterator.h
@@ -1,6 +1,8 @@
 #ifndef DIR_ITERATOR_H
 #define DIR_ITERATOR_H
 
 #ifndef DIR_ITERATOR_H
 #define DIR_ITERATOR_H
 

+#include "strbuf.h"
+

 /*
  * Iterate over a directory tree.
  *
 /*
  * Iterate over a directory tree.
  *

diff --git a/fsck.h b/fsck.h
index c3cf5e00347bee21e161a558c6f3b8fbcad0be66..0c7e8c9428bbc808abf27ff5dfe77d8d7309b470 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -6,6 +6,7 @@
 #define FSCK_IGNORE 3
 
 struct fsck_options;
 #define FSCK_IGNORE 3
 
 struct fsck_options;

+struct object;

 
 void fsck_set_msg_type(struct fsck_options *options,
                const char *msg_id, const char *msg_type);
 
 void fsck_set_msg_type(struct fsck_options *options,
                const char *msg_id, const char *msg_type);

diff --git a/fsmonitor.h b/fsmonitor.h
index 65f37436369cd934f2bdb3b627396c5f72a7cb03..01017c43aa68be952ec6b89530fb5aa85c8a098b 100644 (file)
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -1,6 +1,9 @@
 #ifndef FSMONITOR_H
 #define FSMONITOR_H
 
 #ifndef FSMONITOR_H
 #define FSMONITOR_H
 

+#include "cache.h"
+#include "dir.h"
+

 extern struct trace_key trace_fsmonitor;
 
 /*
 extern struct trace_key trace_fsmonitor;
 
 /*

diff --git a/gpg-interface.h b/gpg-interface.h
index 5ecff4aa0c062d8a33290d39456e24c073fd48e4..acf50c46109e57bcc7809ab394c73a4d050ad9f0 100644 (file)
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -1,6 +1,8 @@
 #ifndef GPG_INTERFACE_H
 #define GPG_INTERFACE_H
 
 #ifndef GPG_INTERFACE_H
 #define GPG_INTERFACE_H
 

+struct strbuf;
+

 #define GPG_VERIFY_VERBOSE             1
 #define GPG_VERIFY_RAW                 2
 #define GPG_VERIFY_OMIT_STATUS 4
 #define GPG_VERIFY_VERBOSE             1
 #define GPG_VERIFY_RAW                 2
 #define GPG_VERIFY_OMIT_STATUS 4

diff --git a/khash.h b/khash.h
index c0da40daa78f703f825208bb7d1b4b5b3cc05ae3..07b4cc2e6714598ef920dcf28b8f73ba34979677 100644 (file)
--- a/khash.h
+++ b/khash.h
@@ -26,6 +26,9 @@
 #ifndef __AC_KHASH_H
 #define __AC_KHASH_H
 
 #ifndef __AC_KHASH_H
 #define __AC_KHASH_H
 

+#include "cache.h"
+#include "hashmap.h"
+

 #define AC_VERSION_KHASH_H "0.2.8"
 
 typedef uint32_t khint32_t;
 #define AC_VERSION_KHASH_H "0.2.8"
 
 typedef uint32_t khint32_t;

diff --git a/list-objects-filter.h b/list-objects-filter.h
index a963d0274ceb1ea80c9b4ba2003dfb4dd0226116..a6f6b4990b43c8f4c8cb94ba5b890370287ec868 100644 (file)
--- a/list-objects-filter.h
+++ b/list-objects-filter.h
@@ -1,6 +1,10 @@
 #ifndef LIST_OBJECTS_FILTER_H
 #define LIST_OBJECTS_FILTER_H
 
 #ifndef LIST_OBJECTS_FILTER_H
 #define LIST_OBJECTS_FILTER_H
 

+struct list_objects_filter_options;
+struct object;
+struct oidset;
+

 /*
  * During list-object traversal we allow certain objects to be
  * filtered (omitted) from the result.  The active filter uses
 /*
  * During list-object traversal we allow certain objects to be
  * filtered (omitted) from the result.  The active filter uses

diff --git a/list-objects.h b/list-objects.h
index aa618d7f4579b2ec9c4e506f821caa1fc3fb2b37..ad407629269a7e7c77953390beccf036fd2452f6 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -1,6 +1,10 @@
 #ifndef LIST_OBJECTS_H
 #define LIST_OBJECTS_H
 
 #ifndef LIST_OBJECTS_H
 #define LIST_OBJECTS_H
 

+struct commit;
+struct object;
+struct rev_info;
+

 typedef void (*show_commit_fn)(struct commit *, void *);
 typedef void (*show_object_fn)(struct object *, const char *, void *);
 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
 typedef void (*show_commit_fn)(struct commit *, void *);
 typedef void (*show_object_fn)(struct object *, const char *, void *);
 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);

diff --git a/ll-merge.h b/ll-merge.h
index 244a31f55ac7375b59d7c257bfc2391957fdca94..b72b19921e8f33ab23aa5bb6293b9b6841035df9 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -5,6 +5,8 @@
 #ifndef LL_MERGE_H
 #define LL_MERGE_H
 
 #ifndef LL_MERGE_H
 #define LL_MERGE_H
 

+#include "xdiff/xdiff.h"
+

 struct ll_merge_options {
        unsigned virtual_ancestor : 1;
        unsigned variant : 2;   /* favor ours, favor theirs, or union merge */
 struct ll_merge_options {
        unsigned virtual_ancestor : 1;
        unsigned variant : 2;   /* favor ours, favor theirs, or union merge */

diff --git a/mailinfo.h b/mailinfo.h
index 04a25351d6d39c4d0bb00943bb23ee99e8d41bcf..766c03dd1d29d00beb75b7553fc6717e24978384 100644 (file)
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -1,6 +1,8 @@
 #ifndef MAILINFO_H
 #define MAILINFO_H
 
 #ifndef MAILINFO_H
 #define MAILINFO_H
 

+#include "strbuf.h"
+

 #define MAX_BOUNDARIES 5
 
 struct mailinfo {
 #define MAX_BOUNDARIES 5
 
 struct mailinfo {

diff --git a/mailmap.h b/mailmap.h
index ed7c93b05c3cc904c3052bae199346a698eec1e6..d0e65646cb57e60aa9021c0d8754c6844199acb8 100644 (file)
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,6 +1,8 @@
 #ifndef MAILMAP_H
 #define MAILMAP_H
 
 #ifndef MAILMAP_H
 #define MAILMAP_H
 

+struct string_list;
+

 int read_mailmap(struct string_list *map, char **repo_abbrev);
 void clear_mailmap(struct string_list *map);
 
 int read_mailmap(struct string_list *map, char **repo_abbrev);
 void clear_mailmap(struct string_list *map);
 

diff --git a/merge-recursive.h b/merge-recursive.h
index fa7bc6b6836f99ab9c417e2865cd5a544488d025..0c46a5a4ff48340efac6c4fd6399855067313c3b 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,8 +1,10 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 

-#include "unpack-trees.h"

 #include "string-list.h"
 #include "string-list.h"

+#include "unpack-trees.h"
+
+struct commit;

 
 struct merge_options {
        const char *ancestor;
 
 struct merge_options {
        const char *ancestor;

diff --git a/notes-merge.h b/notes-merge.h
index f815f23451b4fc8c8a88be0f9475890d8c84c60f..6c74e9385b83ce317d6ca91f328c7790d0753e2c 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -2,6 +2,10 @@
 #define NOTES_MERGE_H
 
 #include "notes-utils.h"
 #define NOTES_MERGE_H
 
 #include "notes-utils.h"

+#include "strbuf.h"
+
+struct commit;
+struct object_id;

 
 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
 
 
 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
 

diff --git a/notes-utils.h b/notes-utils.h
index 5d79cbef512e3bdbbfafedbd7650036aff695f83..54083065283f681d8354af633b805a4896c8b036 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -3,6 +3,9 @@
 
 #include "notes.h"
 
 
 #include "notes.h"
 

+struct commit_list;
+struct object_id;
+

 /*
  * Create new notes commit from the given notes tree
  *
 /*
  * Create new notes commit from the given notes tree
  *

diff --git a/notes.h b/notes.h
index 0433f45db55b5b807abcd633f507e9c75324d4e6..414bc6855ad1593fb281f6a829797b34f3fb2e12 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -3,6 +3,9 @@
 
 #include "string-list.h"
 
 
 #include "string-list.h"
 

+struct object_id;
+struct strbuf;
+

 /*
  * Function type for combining two notes annotating the same object.
  *
 /*
  * Function type for combining two notes annotating the same object.
  *

diff --git a/object-store.h b/object-store.h
index e481f7ad41bd876df3fb98f1578c38f55fc288e5..b6f2c732c42e1a4429d9e8c47f951a9f26ca1a9f 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -1,6 +1,7 @@
 #ifndef OBJECT_STORE_H
 #define OBJECT_STORE_H
 
 #ifndef OBJECT_STORE_H
 #define OBJECT_STORE_H
 

+#include "cache.h"

 #include "oidmap.h"
 #include "list.h"
 #include "sha1-array.h"
 #include "oidmap.h"
 #include "list.h"
 #include "sha1-array.h"

diff --git a/object.h b/object.h
index 177b1a4571fb60f75d523124c09c133c2f5c84e6..6e28fdd0b426a3e276001e674675cf386f7d86c1 100644 (file)
--- a/object.h
+++ b/object.h
@@ -1,6 +1,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
 #ifndef OBJECT_H
 #define OBJECT_H
 

+#include "cache.h"
+

 struct buffer_slab;
 
 struct parsed_object_pool {
 struct buffer_slab;
 
 struct parsed_object_pool {

diff --git a/oidmap.h b/oidmap.h
index d3cd2bb5902964554a16313cdb9ba4924e871e56..72430b611ebf710b4c3ba0160af91104258db138 100644 (file)
--- a/oidmap.h
+++ b/oidmap.h
@@ -1,6 +1,7 @@
 #ifndef OIDMAP_H
 #define OIDMAP_H
 
 #ifndef OIDMAP_H
 #define OIDMAP_H
 

+#include "cache.h"

 #include "hashmap.h"
 
 /*
 #include "hashmap.h"
 
 /*

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 4555907dee99fbf731b739c584837adbbe8270f1..8a04741e1253b0ba801445a76ceb8e4937121f73 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -5,6 +5,9 @@
 #include "khash.h"
 #include "pack-objects.h"
 
 #include "khash.h"
 #include "pack-objects.h"
 

+struct commit;
+struct rev_info;
+

 struct bitmap_disk_header {
        char magic[4];
        uint16_t version;
 struct bitmap_disk_header {
        char magic[4];
        uint16_t version;

diff --git a/pack-objects.h b/pack-objects.h
index edf74dabddfdb2b67bad803d1c898e93a3af4d8b..08c6b57d49791556f323ebf8654e98689a19593c 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -2,6 +2,7 @@
 #define PACK_OBJECTS_H
 
 #include "object-store.h"
 #define PACK_OBJECTS_H
 
 #include "object-store.h"

+#include "pack.h"

 
 #define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
 
 
 #define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
 

diff --git a/patch-ids.h b/patch-ids.h
index bec0f727a7bc4345e524ff04d9569c68fabd2209..79ac9a8498383b971107f4b30a7a75dbd30613d1 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -1,6 +1,12 @@
 #ifndef PATCH_IDS_H
 #define PATCH_IDS_H
 
 #ifndef PATCH_IDS_H
 #define PATCH_IDS_H
 

+#include "diff.h"
+#include "hashmap.h"
+
+struct commit;
+struct object_id;
+

 struct patch_id {
        struct hashmap_entry ent;
        struct object_id patch_id;
 struct patch_id {
        struct hashmap_entry ent;
        struct object_id patch_id;

diff --git a/path.h b/path.h
index ed6732e5a22ca8fbceff68437c9df616bb819cc9..b654ea8ff5f2e701239ec17b8d1fc81cebfc25dd 100644 (file)
--- a/path.h
+++ b/path.h
@@ -2,6 +2,7 @@
 #define PATH_H
 
 struct repository;
 #define PATH_H
 
 struct repository;

+struct strbuf;

 
 /*
  * The result to all functions which return statically allocated memory may be
 
 /*
  * The result to all functions which return statically allocated memory may be

diff --git a/pathspec.h b/pathspec.h
index 099a170c2ef6eb01bee98c7ebf638f34655fda86..a6525a65517bd08921ad836880184048e93c4cfa 100644 (file)
--- a/pathspec.h
+++ b/pathspec.h
@@ -1,6 +1,8 @@
 #ifndef PATHSPEC_H
 #define PATHSPEC_H
 
 #ifndef PATHSPEC_H
 #define PATHSPEC_H
 

+struct index_state;
+

 /* Pathspec magic */
 #define PATHSPEC_FROMTOP       (1<<0)
 #define PATHSPEC_MAXDEPTH      (1<<1)
 /* Pathspec magic */
 #define PATHSPEC_FROMTOP       (1<<0)
 #define PATHSPEC_MAXDEPTH      (1<<1)

diff --git a/pretty.h b/pretty.h
index 5c85d94e332d7f87f3f963c775eabdfa08347033..7359d318a92c167e0f36eabf73fdd1142f0e9031 100644 (file)
--- a/pretty.h
+++ b/pretty.h
@@ -1,7 +1,11 @@
 #ifndef PRETTY_H
 #define PRETTY_H
 
 #ifndef PRETTY_H
 #define PRETTY_H
 

+#include "cache.h"
+#include "string-list.h"
+

 struct commit;
 struct commit;

+struct strbuf;

 
 /* Commit formats */
 enum cmit_fmt {
 
 /* Commit formats */
 enum cmit_fmt {

diff --git a/reachable.h b/reachable.h
index 3c00fa0526cd97e36111f2d94ccbf3d2817ccf34..18b0f9f2f0df0b6cceb67bc0eee81244e3c8a114 100644 (file)
--- a/reachable.h
+++ b/reachable.h
@@ -2,6 +2,8 @@
 #define REACHEABLE_H
 
 struct progress;
 #define REACHEABLE_H
 
 struct progress;

+struct rev_info;
+

 extern int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
                                                  timestamp_t timestamp);
 extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 extern int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
                                                  timestamp_t timestamp);
 extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog,

diff --git a/reflog-walk.h b/reflog-walk.h
index 7553c448fe5bf8b432d7fdb2ef5cba967bb985cd..cb3e73755d445b866ad51246dc8b1ea3ab6f1639 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -3,6 +3,7 @@
 
 #include "cache.h"
 
 
 #include "cache.h"
 

+struct commit;

 struct reflog_walk_info;
 
 extern void init_reflog_walk(struct reflog_walk_info **info);
 struct reflog_walk_info;
 
 extern void init_reflog_walk(struct reflog_walk_info **info);

diff --git a/refs.h b/refs.h
index cc2fb4c68c0e194dc51e3846192911c2c6949c6b..bd52c1bbae3a68fe8ca8f9e6cae7cc54bdbf9852 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -3,8 +3,10 @@
 
 struct object_id;
 struct ref_store;
 
 struct object_id;
 struct ref_store;

+struct repository;

 struct strbuf;
 struct string_list;
 struct strbuf;
 struct string_list;

+struct string_list_item;

 struct worktree;
 
 /*
 struct worktree;
 
 /*

diff --git a/remote.h b/remote.h
index 976292152c020127e6c88d54e5448ef21e0eb4e8..88f8480c71a2e5ac494ef65532619a4322c1d32a 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -1,6 +1,7 @@
 #ifndef REMOTE_H
 #define REMOTE_H
 
 #ifndef REMOTE_H
 #define REMOTE_H
 

+#include "cache.h"

 #include "parse-options.h"
 #include "hashmap.h"
 #include "refspec.h"
 #include "parse-options.h"
 #include "hashmap.h"
 #include "refspec.h"

diff --git a/repository.h b/repository.h
index b9413be50cfd0c9d17865220c3db5eb16024187e..13c87996789f68a4371d1b0a55c6d6ff52a73251 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -1,6 +1,8 @@
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 

+#include "path.h"
+

 struct config_set;
 struct git_hash_algo;
 struct index_state;
 struct config_set;
 struct git_hash_algo;
 struct index_state;

diff --git a/resolve-undo.h b/resolve-undo.h
index 87291904bd34e0e7f3a3601b6742f5345391824d..fbe348efac929f9202c4f3e81d962e84157b9082 100644 (file)
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -1,6 +1,8 @@
 #ifndef RESOLVE_UNDO_H
 #define RESOLVE_UNDO_H
 
 #ifndef RESOLVE_UNDO_H
 #define RESOLVE_UNDO_H
 

+#include "cache.h"
+

 struct resolve_undo_info {
        unsigned int mode[3];
        struct object_id oid[3];
 struct resolve_undo_info {
        unsigned int mode[3];
        struct object_id oid[3];

diff --git a/revision.h b/revision.h
index c599c34da91e57572b1c5b315c353d33399e8a09..850e50878317a9afec6c3aac5a52699d3f66d58e 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -1,6 +1,7 @@
 #ifndef REVISION_H
 #define REVISION_H
 
 #ifndef REVISION_H
 #define REVISION_H
 

+#include "commit.h"

 #include "parse-options.h"
 #include "grep.h"
 #include "notes.h"
 #include "parse-options.h"
 #include "grep.h"
 #include "notes.h"

diff --git a/send-pack.h b/send-pack.h
index 6af71f7008127df0acb72cfaf3b679f7ef332a4e..e148fcd960994b1724f8d09c4ea4897b1cf069f0 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -3,6 +3,10 @@
 
 #include "string-list.h"
 
 
 #include "string-list.h"
 

+struct child_process;
+struct oid_array;
+struct ref;
+

 /* Possible values for push_cert field in send_pack_args. */
 #define SEND_PACK_PUSH_CERT_NEVER 0
 #define SEND_PACK_PUSH_CERT_IF_ASKED 1
 /* Possible values for push_cert field in send_pack_args. */
 #define SEND_PACK_PUSH_CERT_NEVER 0
 #define SEND_PACK_PUSH_CERT_IF_ASKED 1

diff --git a/sequencer.h b/sequencer.h
index c5787c6b566bbc89caad1a099f4281fecba01766..c751c9d6e4f78e7d9e2700dcc3fb3157961fb049 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -1,6 +1,11 @@
 #ifndef SEQUENCER_H
 #define SEQUENCER_H
 
 #ifndef SEQUENCER_H
 #define SEQUENCER_H
 

+#include "cache.h"
+#include "strbuf.h"
+
+struct commit;
+

 const char *git_path_commit_editmsg(void);
 const char *git_path_seq_dir(void);
 
 const char *git_path_commit_editmsg(void);
 const char *git_path_seq_dir(void);
 

diff --git a/shortlog.h b/shortlog.h
index 5d64cfe929684807fcfa004ec3edf10d720189c9..2fa61c42946262238ae2f1662ef3c2d1e981b274 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -3,6 +3,8 @@
 
 #include "string-list.h"
 
 
 #include "string-list.h"
 

+struct commit;
+

 struct shortlog {
        struct string_list list;
        int summary;
 struct shortlog {
        struct string_list list;
        int summary;

diff --git a/submodule.h b/submodule.h
index 4644683e6cb39916a942e501eacb8663d89c3f6b..3adbc08915e7df067bb10f1caaf7578dfbe10a89 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -1,11 +1,17 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 

-struct repository;
-struct diff_options;

 struct argv_array;
 struct argv_array;

+struct cache_entry;
+struct diff_options;
+struct index_state;
+struct object_id;

 struct oid_array;
 struct oid_array;

+struct pathspec;

 struct remote;
 struct remote;

+struct repository;
+struct string_list;
+struct strbuf;

 
 enum {
        RECURSE_SUBMODULES_ONLY = -5,
 
 enum {
        RECURSE_SUBMODULES_ONLY = -5,

diff --git a/tempfile.h b/tempfile.h
index 8959c5f1b5761dc34f1742a96941f67efd6429a7..36434eb6fa64721bcafdb40db5f9e7d0400a50b4 100644 (file)
--- a/tempfile.h
+++ b/tempfile.h
@@ -2,6 +2,7 @@
 #define TEMPFILE_H
 
 #include "list.h"
 #define TEMPFILE_H
 
 #include "list.h"

+#include "strbuf.h"

 
 /*
  * Handle temporary files.
 
 /*
  * Handle temporary files.

diff --git a/trailer.h b/trailer.h
index 6d7f8c2a52305d3d937b69a877f1ae0b7af94363..9c10026c358326ce0c0098ca52341ce8160c5bbe 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -3,6 +3,8 @@
 
 #include "list.h"
 
 
 #include "list.h"
 

+struct strbuf;
+

 enum trailer_where {
        WHERE_DEFAULT,
        WHERE_END,
 enum trailer_where {
        WHERE_DEFAULT,
        WHERE_END,

diff --git a/tree-walk.h b/tree-walk.h
index 805f58f00f6f0d4c9e6f6f05520bd1cd62d5f661..196831007e618f808661bf4b7f54030890f48563 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,6 +1,8 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 

+struct strbuf;
+

 struct name_entry {
        const struct object_id *oid;
        const char *path;
 struct name_entry {
        const struct object_id *oid;
        const char *path;

diff --git a/unpack-trees.h b/unpack-trees.h
index c2b434c60648fb0e287c100a32d9346a765ab74f..48bc69cb4725c9df032baf1937adaa988a774cc4 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,11 +1,14 @@
 #ifndef UNPACK_TREES_H
 #define UNPACK_TREES_H
 
 #ifndef UNPACK_TREES_H
 #define UNPACK_TREES_H
 

-#include "tree-walk.h"
+#include "cache.h"

 #include "argv-array.h"
 #include "argv-array.h"

+#include "string-list.h"
+#include "tree-walk.h"

 
 #define MAX_UNPACK_TREES 8
 
 
 #define MAX_UNPACK_TREES 8
 

+struct cache_entry;

 struct unpack_trees_options;
 struct exclude_list;
 
 struct unpack_trees_options;
 struct exclude_list;
 

diff --git a/url.h b/url.h
index abdaf6fa30b68767f48b056c977e498f9cfe7de2..f311c40a4680bfedf0ad2d511a5599fb5dcabd6e 100644 (file)
--- a/url.h
+++ b/url.h
@@ -1,6 +1,8 @@
 #ifndef URL_H
 #define URL_H
 
 #ifndef URL_H
 #define URL_H
 

+struct strbuf;
+

 extern int is_url(const char *url);
 extern int is_urlschemechar(int first_flag, int ch);
 extern char *url_decode(const char *url);
 extern int is_url(const char *url);
 extern int is_urlschemechar(int first_flag, int ch);
 extern char *url_decode(const char *url);

diff --git a/utf8.h b/utf8.h
index db73a2d8d374e7570471627693ecddc87d998f10..dd5ee1052a849e85954d4425e0714fb38dcf1c1f 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -1,6 +1,8 @@
 #ifndef GIT_UTF8_H
 #define GIT_UTF8_H
 
 #ifndef GIT_UTF8_H
 #define GIT_UTF8_H
 

+struct strbuf;
+

 typedef unsigned int ucs_char_t;  /* assuming 32bit int */
 
 size_t display_mode_esc_sequence_len(const char *s);
 typedef unsigned int ucs_char_t;  /* assuming 32bit int */
 
 size_t display_mode_esc_sequence_len(const char *s);

diff --git a/worktree.h b/worktree.h
index fe38ce10c300ba456f406950bf960d19d5d79cce..df3fc30f73692d296fc875bf1944813fa7e1fb3a 100644 (file)
--- a/worktree.h
+++ b/worktree.h
@@ -1,6 +1,7 @@
 #ifndef WORKTREE_H
 #define WORKTREE_H
 
 #ifndef WORKTREE_H
 #define WORKTREE_H
 

+#include "cache.h"

 #include "refs.h"
 
 struct strbuf;
 #include "refs.h"
 
 struct strbuf;