diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index 7137a39ed..e313f7f56 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -23,7 +23,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 /* SJB added edit line support 2005-05-05 */
 #include <editline/readline.h>
 #endif /* HAVE_BSDEDITLINE */
-
+extern IFsimulator SIMinfo;
 static void byemesg(void);
 
 void
@@ -79,6 +79,11 @@ com_quit(wordlist *wl)
                 *buf = 'y';
             }
             if ((*buf == 'y') || (*buf == 'Y') || (*buf == '\n')) {
+#ifdef EXPERIMENTAL_CODE 	    
+	        /* Destroy CKT when quit. Add by Gong Ding, gdiso@ustc.edu */
+	        for (cc = ft_circuits; cc; cc = cc->ci_next) 
+		 if(SIMinfo.deleteCircuit) SIMinfo.deleteCircuit(cc->ci_ckt); 
+#endif
                 byemesg();
 	    }
             else {
diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c
index 3851b5f22..c6e758c29 100644
--- a/src/frontend/terminal.c
+++ b/src/frontend/terminal.c
@@ -29,7 +29,7 @@ $Id$
 #endif
 
 #ifdef HAVE_TERMCAP
-#include <termcap.h>
+#include <ncurses/termcap.h>
 #endif
 
 #include <ngspice.h>