diff --git a/src/frontend/control.c b/src/frontend/control.c
index 0c09043aa..9c68c9171 100644
--- a/src/frontend/control.c
+++ b/src/frontend/control.c
@@ -873,7 +873,6 @@ cp_evloop(char *string)
 
 
 /* This blows away the control structures... */
-void cp_free_control(void); /* needed by resetcontrol */
 void cp_resetcontrol(void)
 {
     fprintf(cp_err, "Warning: clearing control structures\n");
diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index f9b8674e8..b1ed0fb6e 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -120,6 +120,7 @@ com_quit(wordlist *wl)
     cp_remvar_all();
     if (Infile_Path)
         tfree(Infile_Path);
+    cp_free_control();
 
 #ifdef SHARED_MODULE
     /* add 1000 to notify that we exit from 'quit' */
diff --git a/src/include/ngspice/cpextern.h b/src/include/ngspice/cpextern.h
index 608b88f11..94da1db51 100644
--- a/src/include/ngspice/cpextern.h
+++ b/src/include/ngspice/cpextern.h
@@ -168,6 +168,7 @@ extern struct variable *cp_setparse(wordlist *wl);
 extern wordlist *vareval(char *string);
 extern char *span_var_expr(char *t);
 extern void cp_remvar_all(void);
+extern void cp_free_control(void);
 
 /* var2.c */
 extern void cp_vprint(void);