diff --git a/include/graphics/newcrt.h b/include/graphics/newcrt.h
index 37e6c2adf0fb72d15a47d82bab909d3efefb5502..8d3446d996de01b27af0a92bcf375191db419b51 100644
--- a/include/graphics/newcrt.h
+++ b/include/graphics/newcrt.h
@@ -202,8 +202,8 @@ void nc_getXY (long *x, long *y);
 void nc_setXY (int x, int y);
 void nc_gotoXY (int x, int y);
 void nc_cursXY (int x, int y);
-void nc_cursorOn ();
-void nc_cursorOff ();
+void nc_cursor_on();
+void nc_cursor_off();
 void nc_nothing ();
 void nc_unInit ();
 void nc_init ();
diff --git a/include/logglobals.h b/include/logglobals.h
index f400faef1dd166438ba2561ca767a876f4e3389e..2e1fdc09dc64076bc8d2ba287fb2d1fffe858a73 100644
--- a/include/logglobals.h
+++ b/include/logglobals.h
@@ -6,8 +6,6 @@
 #include "settings.h"
 #include "logstructs.h"
 
-extern char *GetChipmunkPath();
-
 /* 0*/
 /* If the pen is in "this" sector, */
 /* 1*/
@@ -200,12 +198,4 @@ extern int suppressdots;   /* Temporarily suppressing red dots */
 extern int glowsolder;   /* Display solder dots in Glow mode */
 extern int vlsi;   /* Current page is VLSI mode */
 
-
-extern void m_saveclip ();
-
-extern void nc_cursor_on ();
-
-extern void nc_cursor_off ();
-
-
 #endif
diff --git a/include/logstuff.h b/include/logstuff.h
index ae449e6f45e4c1a15c3778047bd9a0b54f71dea2..6cdd5aebab561701c28059f7f29d374f25aac7e2 100644
--- a/include/logstuff.h
+++ b/include/logstuff.h
@@ -1,9 +1,9 @@
 #ifndef LOGSTUFF_H
 #define LOGSTUFF_H
 
-extern void init_X_screen(void);
-extern void recolor_log_cursors(int color, int force);
-extern void choose_log_cursor(int curs);
+void recolor_log_cursors(int color, int force);
+void choose_log_cursor(int curs);
+void m_saveclip ();
 
 int findprocedure(char *name, void (**proc)());
 
diff --git a/include/screen.h b/include/screen.h
index 544aea02d323d98972cc8cfbef1b0e3de90dc9ee..5952ed99e982d0767124aca321b45ae1e6c7cf16 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -131,4 +131,6 @@ void xorcursor();
 
 int hvline(short x1, short y1, short *x2, short *y2);
 
+void init_X_screen();
+
 #endif
diff --git a/include/utils/p2c.h b/include/utils/p2c.h
index 5e2add357f13e1c31ca9f5f672febb9f9fa970ed..6f60d5c9331d0169e09342f293f5343cc2917532 100644
--- a/include/utils/p2c.h
+++ b/include/utils/p2c.h
@@ -110,6 +110,8 @@ long    *P_addsetr    (long *, unsigned, unsigned) DEPRECATED;
 long    *P_remset     (long *, unsigned) DEPRECATED;
 long    *P_expset     (long *, long) DEPRECATED;
 
+char *GetChipmunkPath();
+
 /* I/O error handling */
 #define _SETIO(cond,ior)          (P_ioresult = (cond) ? 0 : (ior))
 
diff --git a/src/log.c b/src/log.c
index 0caeb201bbc502565f74b1768c8c386691fa8a04..84d93be11b621980b937a410896d7f8f0b63ccd5 100644
--- a/src/log.c
+++ b/src/log.c
@@ -76,8 +76,6 @@
 
 #include "configreader.h"
 
-char *GetChipmunkPath();
-
 enum cursors;
 enum cursors cursortype;
 enum cursors oldcursortype;
diff --git a/src/pagereader.c b/src/pagereader.c
index a2dae78c58f637a014b84b05a78850daed63861c..668e65accdccf2a470d221fbb51f12be977a8074 100644
--- a/src/pagereader.c
+++ b/src/pagereader.c
@@ -1,5 +1,6 @@
 #include "pagereader.h"
 
+#include <utils/p2c.h>
 #include "logfont.h"
 #include "node.h"
 #include "log.h"