--- a/macro.h	Sun Dec 19 19:51:36 2010 -0500
+++ b/macro.h	Sun Dec 19 21:42:01 2010 -0500
@@ -1,4 +1,11 @@
 struct place;
 
-void macro_define(struct place *, const char *macro, const char *expansion);
+void macro_define(struct place *, const char *macro,
+		  struct place *, const char *expansion);
 void macro_undef(const char *macro);
+bool macro_isdefined(const char *macro);
+
+char *macroexpand(struct place *, char *buf, size_t len, bool honordefined);
+
+void macro_sendline(struct place *, char *buf, size_t len);
+void macro_sendeof(struct place *);