diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index a275b3148..cb42e38ab 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -26,7 +26,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "numparam/numpaif.h"
 
 #include "ngspice/inpdefs.h"
+
+#if defined(XSPICE) && defined(SIMULATOR)
 #include "ngspice/evtproto.h"
+#endif
 
 extern void line_free_x(struct card *deck, bool recurse);
 extern INPmodel *modtab;
@@ -238,8 +241,10 @@ com_remcirc(wordlist *wl)
     /* The next lines stem from com_rset */
     INPkillMods();
 
-    /* remove event queues */
+#if defined(XSPICE) && defined(SIMULATOR)
+    /* remove event queues, if XSPICE and not nutmeg */
     EVTunsetup(ft_curckt->ci_ckt);
+#endif
 
     if_cktfree(ft_curckt->ci_ckt, ft_curckt->ci_symtab);
     for (v = ft_curckt->ci_vars; v; v = next) {