expr, eval: Clean up header dependencies

1 files changed, 1 insertions, 17 deletions

diff --git a/expr.h b/expr.h
index 4bb2e84..2462861 100644
--- a/expr.h
+++ b/expr.h
@@ -22,6 +22,7 @@
 #define BFS_EXPR_H
 
 #include "color.h"
+#include "eval.h"
 #include "exec.h"
 #include "printf.h"
 #include "stat.h"
@@ -37,23 +38,6 @@
 struct expr;
 
 /**
- * Ephemeral state for evaluating an expression.
- */
-struct eval_state;
-
-/**
- * Expression evaluation function.
- *
- * @param expr
- *         The current expression.
- * @param state
- *         The current evaluation state.
- * @return
- *         The result of the test.
- */
-typedef bool eval_fn(const struct expr *expr, struct eval_state *state);
-
-/**
  * Possible types of numeric comparison.
  */
 enum cmp_flag {