diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index c4f6516f9..6d9b6c9e8 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -6618,7 +6618,7 @@ ako_model(struct card *startcard)
    ron      r_on
    roff     r_off
 */
-int
+static int
 rep_spar(char *inpar[4])
 {
     int i;
diff --git a/src/include/ngspice/evtshared.h b/src/include/ngspice/evtshared.h
new file mode 100644
index 000000000..7df286217
--- /dev/null
+++ b/src/include/ngspice/evtshared.h
@@ -0,0 +1,56 @@
+#ifndef ngspice_EVTSHARED_H
+#define ngspice_EVTSHARED_H
+
+/* ===========================================================================
+FILE    EVTshared.h
+
+MEMBER OF process XSPICE
+
+Copyright 2018
+Holger Vogt
+All Rights Reserved
+
+PROJECT A-8503
+
+AUTHORS
+
+    7/21/2018  Holger Vogt
+
+MODIFICATIONS
+
+    <date> <person name> <nature of modifications>
+
+SUMMARY
+
+    This file contains ANSI C function prototypes for functions
+    in the event-driven simulation algorithm package.
+
+INTERFACES
+
+    None.
+
+REFERENCED FILES
+
+    None.
+
+NON-STANDARD FEATURES
+
+    None.
+
+=========================================================================== */
+
+#include "ngspice/cktdefs.h"
+#include "ngspice/cpstd.h"
+#include "ngspice/evt.h"
+#include "ngspice/mifdefs.h"
+#include "ngspice/ipc.h"
+
+
+/* ******************* */
+/* Function Prototypes */
+/* ******************* */
+
+struct evt_shared_data *EVTshareddata(char *node_name);
+char** EVTallnodes(void);
+
+#endif
diff --git a/src/sharedspice.c b/src/sharedspice.c
index 41df8e4a8..f50108d40 100644
--- a/src/sharedspice.c
+++ b/src/sharedspice.c
@@ -164,6 +164,12 @@ typedef void (*sighandler)(int);
 #define S_IRWXU _S_IWRITE
 #endif
 
+
+#ifdef XSPICE
+#include "ngspice/evtshared.h"
+extern bool wantevtdata;
+#endif
+
 extern IFfrontEnd nutmeginfo;
 
 extern struct comm spcp_coms[ ];
@@ -172,11 +178,6 @@ extern int SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator);
 extern wordlist *cp_varwl(struct variable *var);
 extern void create_circbyline(char *line);
 
-#ifdef XSPICE
-extern struct evt_shared_data *EVTshareddata(char *node_name);
-extern char** EVTallnodes(void);
-extern bool wantevtdata;
-#endif
 
 
 /*The current run (to get variable names, etc)*/
diff --git a/src/xspice/evt/evtshared.c b/src/xspice/evt/evtshared.c
index c8c70c5fc..a308a8e06 100644
--- a/src/xspice/evt/evtshared.c
+++ b/src/xspice/evt/evtshared.c
@@ -43,6 +43,7 @@ NON-STANDARD FEATURES
 #include "ngspice/evtudn.h"
 
 #include "ngspice/evtproto.h"
+#include "ngspice/evtshared.h"
 
 #include <time.h>
 
@@ -68,7 +69,7 @@ pevt_data *return_node;
 pevt_shared_data return_all;
 
 /* delete the information return structures */
-void
+static void
 delete_ret(void)
 {
     int i;