header cleanup:

* add missing forward declarations
* remove needless header inclusions
* some style unification

1 files changed, 7 insertions, 4 deletions

diff --git a/term.h b/term.h
index b6fe8e87..8d86d87a 100644
--- a/term.h
+++ b/term.h
@@ -16,10 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-__BEGIN_DECLS
-
-struct	termp;
-
 enum	termenc {
 	TERMENC_ASCII,
 	TERMENC_LOCALE,
@@ -42,6 +38,8 @@ enum	termfont {
 
 #define	TERM_MAXMARGIN	  100000 /* FIXME */
 
+struct	termp;
+
 typedef void	(*term_margin)(struct termp *, const void *);
 
 struct	termp_tbl {
@@ -102,6 +100,11 @@ struct	termp {
 	struct termp_ps	 *ps;
 };
 
+__BEGIN_DECLS
+
+struct	tbl_span;
+struct	eqn;
+
 const char	 *ascii_uc2str(int);
 
 void		  term_eqn(struct termp *, const struct eqn *);