Merge branch 'sm/show-superproject-while-conflicted' into maint

diff --git a/apply.h b/apply.h
index 78c8bcfc3c4afe5ebd583f58c76eb3ca0e19a702..59483481330c61033d56e363f70dff08f4d689af 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -1,6 +1,9 @@
 #ifndef APPLY_H
 #define APPLY_H
 
+#include "lockfile.h"
+#include "string-list.h"
+
 struct repository;
 
 enum apply_ws_error_action {