merge-recursive: avoid wrapper function when unnecessary and wasteful

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
 
+#include "diff.h"
+#include "hashmap.h"
+
+struct commit;
+struct object_id;
+
 struct patch_id {
        struct hashmap_entry ent;
        struct object_id patch_id;