diff --git a/include/logdig.h b/include/logdig.h
index 825f8b6831b5f560aacfb2e8a67c38b26a8ab674..595a453045c691da8176ba974e9f6886122cf90c 100644
--- a/include/logdig.h
+++ b/include/logdig.h
@@ -43,9 +43,9 @@ typedef struct log_16_action {
   void (*hook_input) (log_action_t *lact, log_nrec *n, log_16_value *v);
   void (*hook_output) (log_action_t *lact, log_nrec *n, log_16_value v);
   void (*hook_ocoutput) (log_action_t *lact, log_nrec *n, log_16_value v);
-  void (*hook_led) (log_action_t *lact, int x, int y, log_16_value v);
-  void (*hook_eraled) (log_action_t *lact, int x, int y);
-  void (*hook_plotled) (log_action_t *lact, int x, int y, log_16_value v);
+  void (*hook_led) (log_action_t *lact, short x, short y, log_16_value v);
+  void (*hook_eraled) (log_action_t *lact, short x, short y);
+  void (*hook_plotled) (log_action_t *lact, short x, short y, log_16_value v);
 } log_16_action;
 
 vextern const log_16_viarr log_16_vi;
diff --git a/include/utils/p2c.h b/include/utils/p2c.h
index 8d9e80a6ceb74c9c3124a65d515886d15e045469..671b8a2bead4889058696668c41748fc6b6f93a5 100644
--- a/include/utils/p2c.h
+++ b/include/utils/p2c.h
@@ -76,8 +76,6 @@ typedef struct {
 
 
 void    PASCAL_MAIN   (int, char **);
-char    **P_argv;
-int     P_argc;
 short   P_escapecode;
 int     P_ioresult;
 __p2c_jmp_buf *__top_jb;
diff --git a/src/log.c b/src/log.c
index 6373adb955462ecc65d89169ff58e2f7ba526e63..b85fc96a80f05ec396ca6fa014ff70987a2627f3 100644
--- a/src/log.c
+++ b/src/log.c
@@ -5245,7 +5245,7 @@ static void gatedefinitioncommand()
 static librstrrec *findlibrstr(char *name_)
 {
 	size_t name_length = strlen(name_);
-	char *name = malloc(sizeof(char) * name_length);
+	char *name = (char*) malloc(sizeof(char) * name_length);
 
 	librstrrec *lsp = librstrs;
 	strreverse(name, name_);
diff --git a/src/logsim.c b/src/logsim.c
index 2b3a73be7996b750f6d0bca41608767d1bc959c5..82d54b10852a00ce43a4a780dbaefe0539a5df55 100644
--- a/src/logsim.c
+++ b/src/logsim.c
@@ -43,6 +43,7 @@
 #include "logsim.h"
 #include "node.h"
 #include "tool.h"
+#include "logstuff.h"
 
 /*$ if debugging $
   $ debug on $