diff --git a/ChangeLog b/ChangeLog
index 5937e6561..10c4c791f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-16  Robert Larice
+ * src/frontend/misccoms.c ,
+ * src/frontend/plotting/plotcurv.c ,
+ * src/frontend/signal_handler.c ,
+ * src/include/fteext.h :
+    collect gr_clean() gr_end() gr_point() gr_start() gr_fixgrid() in "graf.h"
+
 2010-10-16  Robert Larice
  * src/frontend/hcomp.c ,
  * src/frontend/misccoms.c ,
diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index c71734c34..d1a71f02a 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -12,6 +12,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "misccoms.h"
 #include "circuits.h"
 #include "variable.h"
+#include "plotting/graf.h"
 
 #ifdef HAVE_GNUREADLINE
 #include <readline/readline.h>
diff --git a/src/frontend/plotting/plotcurv.c b/src/frontend/plotting/plotcurv.c
index bd9985f02..35bf9e122 100644
--- a/src/frontend/plotting/plotcurv.c
+++ b/src/frontend/plotting/plotcurv.c
@@ -12,6 +12,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include <ftedefs.h>
 #include <dvec.h>
 #include <graph.h>
+#include "graf.h"
 #include <ftedbgra.h>
 
 #include "plotcurv.h"
diff --git a/src/frontend/signal_handler.c b/src/frontend/signal_handler.c
index f226eec59..6e601c1e2 100644
--- a/src/frontend/signal_handler.c
+++ b/src/frontend/signal_handler.c
@@ -16,6 +16,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include <setjmp.h>
 #include <signal.h>
 #include "signal_handler.h"
+#include "plotting/graf.h"
 
 #ifdef HAS_WINDOWS
 void winmessage(char* new_msg);
diff --git a/src/include/fteext.h b/src/include/fteext.h
index e1be277e3..daf1dbc32 100644
--- a/src/include/fteext.h
+++ b/src/include/fteext.h
@@ -217,12 +217,8 @@ extern void gi_update();
 
 extern bool gr_gmode;
 extern bool gr_hmode;
-extern void gr_clean(void);
-extern void gr_end(struct dvec *dv);
 extern void gr_iplot(struct plot *plot);
 extern void gr_pmsg(char *text);
-extern void gr_point(struct dvec *dv, double newx, double newy, double oldx, double oldy, int np);
-extern void gr_start(struct dvec *dv);
 extern double gr_xrange[2];
 extern double gr_yrange[2];
 extern int gr_xmargin;
@@ -232,10 +228,6 @@ extern int gr_ycenter;
 extern int gr_radius;
 extern bool gr_circular;
 
-/* grid.c */
-
-extern void gr_fixgrid(GRAPH *graph, double xdelta, double ydelta, int xtype, int ytype);
-
 /* inp.c */
 
 extern void com_edit(wordlist *wl);