commit f7db6d139bba0fb56f0560533b77af219958ecc0 from: Omar Polo date: Tue Feb 06 14:12:02 2024 UTC some headers cleanup try to not include headers from headers, and remove some redundant include. This helps in modularizing the codebase and also helps during incremental compilations. commit - f2f795dfc521620e435ca094dee03e5c838224cf commit + f7db6d139bba0fb56f0560533b77af219958ecc0 blob - 90dacc925bd186000c1c3705c19c41db4f56cf5e blob + 9dc9d7180bcae9f7a0f61ddc71d24858e9b1643c --- cmd.c +++ cmd.c @@ -25,6 +25,7 @@ #include "compl.h" #include "defaults.h" #include "hist.h" +#include "keymap.h" #include "mcache.h" #include "minibuffer.h" #include "session.h" blob - 6d4df570f0dd6a4931e21550713dc3a920c6a225 blob + 463a3c12612616a467e7c37ca3de6f45abf7c364 --- defaults.c +++ defaults.c @@ -24,6 +24,7 @@ #include "cmd.h" #include "defaults.h" +#include "keymap.h" #include "telescope.h" #include "ui.h" #include "utils.h" blob - f6262ee756ec29f08b3ee0a20111c97569dfbb41 blob + 92846c79dec53dee0a18c10e502abe032106f826 --- fs.c +++ fs.c @@ -35,7 +35,6 @@ #include "pages.h" #include "parser.h" #include "session.h" -#include "telescope.h" #include "utils.h" #include "fs.h" blob - 48302d840847290cf2eac41801438149ab04f62f blob + aeb2fefa2abf58316b2f596b006349b1cbee2348 --- help.c +++ help.c @@ -22,6 +22,7 @@ #include #include "cmd.h" +#include "keymap.h" #include "telescope.h" #include "ui.h" blob - c2a2100df5298dd199cd5ecd22effb373f459ae8 blob + 15ee034088cb08ab0293ff28ce1fe11446b7a79b --- keymap.c +++ keymap.c @@ -22,7 +22,6 @@ #include #include "keymap.h" -#include "telescope.h" #include "utils.h" #define CTRL(n) ((n)&0x1F) blob - 3b1ca4e8c8e72b9764f5845bffdefefd794966b8 blob + 1cf96f12ae9c2078711657af1101ab629ed014bb --- keymap.h +++ keymap.h @@ -17,8 +17,6 @@ #ifndef KEYMAP_H #define KEYMAP_H -#include "compat.h" - #include struct buffer; blob - eb297a3141dc42fac25f1b19d59ee31bb68367d7 blob + 3e60428279ef2a543079d6aae59d4faa4249cabd --- mcache.c +++ mcache.c @@ -20,7 +20,6 @@ #include #include -#include "telescope.h" #include "hist.h" #include "mcache.h" #include "parser.h" blob - a4ce9d23907c107895d8f74e3b8152dc8313e58d blob + 8d89142eefbb9a75bf09433ca10bd83ac2801091 --- minibuffer.c +++ minibuffer.c @@ -27,6 +27,7 @@ #include "fs.h" #include "hist.h" #include "iri.h" +#include "keymap.h" #include "minibuffer.h" #include "session.h" #include "ui.h" blob - 0cab9fe9dc36a7fd833a2125853a7d0aed09da9c blob + 3f37bb628759061e405c7e346dc716cbb568629f --- parser_textpatch.c +++ parser_textpatch.c @@ -23,7 +23,6 @@ #include #include -#include "telescope.h" #include "parser.h" #include "utils.h" blob - f46fa3e7f472b31fb5dd6cc4ce787409974d4d30 blob + 5c873c362908fb136108098ac6e44f0796a1da91 --- parser_textplain.c +++ parser_textplain.c @@ -23,7 +23,6 @@ #include #include -#include "telescope.h" #include "parser.h" static int textplain_parse(struct parser*, const char*, size_t); blob - dd6f462b68fe5aab50f0276b2c7bf44941d39562 blob + 8af4c2ddcddd5dc206f2b4b1960d87bc5d3465b7 --- telescope.c +++ telescope.c @@ -37,6 +37,7 @@ #include "fs.h" #include "hist.h" #include "iri.h" +#include "keymap.h" #include "mcache.h" #include "minibuffer.h" #include "parser.h" blob - 8076f1a032cbbd847ac39fce6badcb53ef729fd8 blob + c80797e2f3b87797fb9e8964e4826553f82d7192 --- ui.c +++ ui.c @@ -44,6 +44,7 @@ #include "cmd.h" #include "defaults.h" #include "hist.h" +#include "keymap.h" #include "minibuffer.h" #include "session.h" #include "telescope.h" blob - 13bb7ca893580b66629601c8000f72aa3c50fa1e blob + 417738236a3ca7b6c5a51481129087f66e2ae84e --- ui.h +++ ui.h @@ -17,9 +17,6 @@ #ifndef UI_H #define UI_H -#include "keymap.h" -#include "telescope.h" - extern int body_lines; extern int body_cols; blob - 4adfaa3b7a6413ca9bb67aa3bfe386ea6e8aa9f7 blob + cda447a43be8dff19b30828bb8fc33e844859a0f --- utf8.c +++ utf8.c @@ -28,7 +28,6 @@ #include #include -#include "telescope.h" #include "utf8.h" #define UTF8_ACCEPT 0 blob - 31b6325bd586f3d65c41bb56cb4bd7079883823d blob + 4ff24022fc18642f124b44f0765910115c507c1e --- utils.h +++ utils.h @@ -17,6 +17,8 @@ #ifndef UTILS_H #define UTILS_H +struct imsgev; + int mark_nonblock_cloexec(int); int has_suffix(const char *, const char *);