* src/frontend/com_compose.c src/frontend/com_display.c

src/frontend/com_compose.c

@@ -7,10 +7,10 @@
 #include <sim.h>
 #include <pnode.h>
 #include <fteext.h>
+#include <cpextern.h>
 
 #include "com_compose.h"
 #include "completion.h"
-#include "streams.h"
 
 /* Copy the data from a vector into a buffer with larger dimensions. */
 static void

src/frontend/com_display.c

@@ -2,9 +2,9 @@
 #include <bool.h>
 #include <variable.h>
 #include <fteext.h>
+#include <cpextern.h>
 
 #include "com_display.h"
-#include "streams.h"
 #include "plotting/plotting.h"
 #include "plotting/pvec.h"
 

src/frontend/com_setscale.c

@@ -2,6 +2,7 @@
 #include <dvec.h>
 #include <cpextern.h>
 
+#include "vectors.h"
 #include "com_setscale.h"
 #include "plotting/plotting.h"
 #include "plotting/pvec.h"

src/frontend/cpitf.c

@@ -10,6 +10,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "fteparse.h"
 #include "cpitf.h"
 
+#include <terminal.h>
+
 #include "completion.h"
 
 /* Set some standard variables and aliases, etc, and init the ccom stuff.  */

src/frontend/doplot.c

@@ -19,6 +19,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "fteext.h"
 #include "doplot.h"
 
+#include "plotting/agraf.h"
+#include "plotting/graf.h"
 
 
 extern double *ft_SMITHminmax(struct dvec *v, bool yval);