From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Fri, 10 Nov 2017 18:01:08 +0000 (+0000)
Subject: context_find.c: Move interface to own file.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/84b0fcf3611555f616abf2dcc80ec30b18f16e29?ds=inline;hp=2ac87fa623959ffb3eb7b7c3565ed85486e99abd

context_find.c: Move interface to own file.
---

diff --git a/Makefile.am b/Makefile.am
index 879308fd..6ff7b0e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -367,6 +367,7 @@ noinst_HEADERS = \
     sbr/atooi.h \
     sbr/base64.h \
     sbr/brkstring.h \
+    sbr/context_find.h \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/lock_file.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index 5b8061b6..cda99fcc 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -31,9 +31,6 @@ int client(char *, char *, char *, int, int);
 void closefds(int);
 char *concat (const char *, ...) ENDNULL;
 int context_del (char *);
-char *context_find (const char *) PURE;
-char *context_find_by_type (const char *, const char *, const char *);
-int context_find_prefix(const char *) PURE;
 int context_foil (char *);
 void context_read (void);
 void context_replace (char *, char *);
diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 4cd68278..7f961c48 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "error.h"
 #include "h/addrsbr.h"
 #include "h/mf.h"
diff --git a/sbr/context_find.c b/sbr/context_find.c
index e725adaa..05e368ba 100644
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 
 
 char *
diff --git a/sbr/context_find.h b/sbr/context_find.h
new file mode 100644
index 00000000..db612af4
--- /dev/null
+++ b/sbr/context_find.h
@@ -0,0 +1,9 @@
+/* context_find.h -- find an entry in the context/profile list
+ *
+ * This code is Copyright (c) 2017, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information. */
+
+char *context_find(const char *) PURE;
+char *context_find_by_type(const char *, const char *, const char *);
+int context_find_prefix(const char *) PURE;
diff --git a/sbr/context_read.c b/sbr/context_read.c
index 7aa68681..b90c5c13 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "readconfig.h"
 #include "path.h"
 #include "error.h"
diff --git a/sbr/credentials.c b/sbr/credentials.c
index 55e7a6b2..b4907c90 100644
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "error.h"
 #include "h/utils.h"
 #include "h/mts.h"
diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index 817ab1fa..106114f8 100644
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "pidstatus.h"
 #include "arglist.h"
 #include "error.h"
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index cd148ed7..1d8dd29c 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"
diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index b91019d9..a7ac1bea 100644
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "brkstring.h"
 #include "h/utils.h"
 
diff --git a/sbr/geteditor.c b/sbr/geteditor.c
index e946e0a8..693d2d77 100644
--- a/sbr/geteditor.c
+++ b/sbr/geteditor.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "h/utils.h"
 
 static char *default_editor = NULL;
diff --git a/sbr/getfolder.c b/sbr/getfolder.c
index d27854ed..c77d3961 100644
--- a/sbr/getfolder.c
+++ b/sbr/getfolder.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 
 
 /* Does not return NULL. */
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index edb0917e..f8e4b6c7 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -14,6 +14,7 @@
  */
  
 #include "h/mh.h"
+#include "context_find.h"
 #include "error.h"
 #include "h/signals.h"
 #include "h/utils.h"
diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index d5d06905..430748b1 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "seq_getnum.h"
 #include "error.h"
 #include "h/utils.h"
diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index e9cffa18..876c1054 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "path.h"
 #include "error.h"
 #include "h/utils.h"
diff --git a/sbr/m_gmprot.c b/sbr/m_gmprot.c
index a3690143..c33b3aef 100644
--- a/sbr/m_gmprot.c
+++ b/sbr/m_gmprot.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "atooi.h"
 
 
diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 75c6baf2..e72cd780 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "path.h"
 #include "h/utils.h"
 #include "m_maildir.h"
diff --git a/sbr/makedir.c b/sbr/makedir.c
index 4f3c5cef..5bb35505 100644
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -10,6 +10,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "atooi.h"
 #include "error.h"
 #include "makedir.h"
diff --git a/sbr/mts.c b/sbr/mts.c
index 151a4d0f..639310b4 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "error.h"
 #include "h/utils.h"
 
diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 8b375a70..5bedadcb 100644
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 
 #ifdef OAUTH_SUPPORT
 
diff --git a/sbr/print_help.c b/sbr/print_help.c
index 15d84eb2..c81f64bc 100644
--- a/sbr/print_help.c
+++ b/sbr/print_help.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "print_sw.h"
 #include "print_help.h"
 
diff --git a/sbr/seq_setprev.c b/sbr/seq_setprev.c
index 0dab8e6c..176a3718 100644
--- a/sbr/seq_setprev.c
+++ b/sbr/seq_setprev.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "brkstring.h"
 #include "seq_add.h"
 #include "h/utils.h"
diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c
index 74212d8d..058648c7 100644
--- a/sbr/seq_setunseen.c
+++ b/sbr/seq_setunseen.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "brkstring.h"
 #include "seq_getnum.h"
 #include "seq_del.h"
diff --git a/sbr/utils.c b/sbr/utils.c
index 03d92044..feb7eccf 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_find.h"
 #include "print_help.h"
 #include "error.h"
 #include "h/utils.h"
diff --git a/uip/ali.c b/uip/ali.c
index b4fe3d85..d7ce4920 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/anno.c b/uip/anno.c
index e4b2887d..1fd2f918 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/burst.c b/uip/burst.c
index da8cfc0c..d7983697 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/comp.c b/uip/comp.c
index c4f31b75..fe7798df 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/dist.c b/uip/dist.c
index 87a5ba1e..1b5bca89 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/flist.c b/uip/flist.c
index 54202459..7819e1f3 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/fmttest.c b/uip/fmttest.c
index ee8790a4..0d20e79a 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/folder.c b/uip/folder.c
index 46090eda..3c11460f 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/forw.c b/uip/forw.c
index dc858539..d8d181af 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/path.h"
diff --git a/uip/inc.c b/uip/inc.c
index 5fde59a8..60a4fd64 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/mark.c b/uip/mark.c
index 3da1c03b..719b534e 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index e5e50c69..fe21b15b 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 3588078a..2bb183e3 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/path.h"
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index a1ea169c..790d402a 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 5d089082..aa9c3aee 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/mhn.c b/uip/mhn.c
index 49c1c83f..0475876a 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 50bdf209..072787e7 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhparse.c b/uip/mhparse.c
index df9734e1..9b8eb973 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 4f6a7c3f..ecb80552 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index fcf04522..bad75b36 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 2985af8f..7716de41 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
diff --git a/uip/mhstore.c b/uip/mhstore.c
index adc11d0e..628d059f 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5d995492..4b34a25c 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/path.h"
 #include "sbr/error.h"
 #include <fcntl.h>
diff --git a/uip/new.c b/uip/new.c
index 5df7f0b4..66f2a617 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/packf.c b/uip/packf.c
index 4420b9cb..331c4bc0 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/pick.c b/uip/pick.c
index e4ad0dcc..2bd0d400 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index d45a56d7..6f6f5559 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 073c35a5..5e7f124c 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/refile.c b/uip/refile.c
index a23c5872..7d08195b 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/repl.c b/uip/repl.c
index 80ece930..488e6078 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/rmf.c b/uip/rmf.c
index c7afa709..0771d2a7 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index 126ef328..872261ea 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/scan.c b/uip/scan.c
index 77341eb9..63374d47 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
diff --git a/uip/send.c b/uip/send.c
index faa40afe..4d02e134 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/push.h"
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 3d911484..10d0baee 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
diff --git a/uip/show.c b/uip/show.c
index 8b749f40..9aa7dd81 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/sortm.c b/uip/sortm.c
index 0d918dab..8ba9f395 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/viamail.c b/uip/viamail.c
index f6d34c3f..6001183b 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index e8e2e711..bb6f0193 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/push.h"
diff --git a/uip/whom.c b/uip/whom.c
index d3e5c5fc..56ae6b46 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"