diff --git a/src/wire.c b/src/wire.c
index ec212748fcadec24c36c0ea406352e59ad414ad6..301dcffb7710649db06b56dfcc938a91d52c575b 100644
--- a/src/wire.c
+++ b/src/wire.c
@@ -1,11 +1,14 @@
 
 #include <utils/p2c.h>
 #include <graphics/newkbd.h>
+#include <utils/sysdevs.h>
 #include "logglobals.h"
 #include "logdef.h"
 #include "utils.h"
 #include "wire.h"
 #include "node.h"
+#include "log.h"
+#include "screen.h"
 
 void fryhwire(log_hwrec *hw);
 void fryvwire(log_vwrec *vw);
@@ -642,11 +645,11 @@ void delvwire(log_vwrec *vw)
 
 /** @brief Add a Horizontal wire.
 
-	Merge with other horizontal wires if touching;
-	solder to other vertical wires in T-intersections;
-	connect to gate pins as necessary.
-	VLSI-mode rules are more complex!
-*/
+  Merge with other horizontal wires if touching;
+  solder to other vertical wires in T-intersections;
+  connect to gate pins as necessary.
+  VLSI-mode rules are more complex!
+  */
 void addhwire(short x1, short x2, short y, short colr)
 {
 	cnrec *cnbase;
@@ -791,11 +794,11 @@ void addhwire2(short x1, short x2, short y)
 
 /** @brief Add a vertical wire.
 
-	Merge with other vertical wires if touching;
-	solder to other horizontal wires in T-intersections;
-	connect to gate pins as necessary.
-	VLSI-mode rules are more complex!
-*/
+  Merge with other vertical wires if touching;
+  solder to other horizontal wires in T-intersections;
+  connect to gate pins as necessary.
+  VLSI-mode rules are more complex!
+  */
 void addvwire(short x, short y1, short y2, short colr)
 {
 	cnrec *cnbase;
@@ -938,39 +941,38 @@ void addvwire2(short x, short y1, short y2)
 
 void fryhwire(log_hwrec *hw)
 {
-        long t0;
+	long t0;
 
-        remcursor();
-        clipon();
-        t0 = timers_sysclock();
-        while (labs(timers_sysclock() - t0) < frytime)
-		{
-                m_color((long)gg.color.conflict);
-                hline(hw->x1, hw->x2, hw->y);
-                m_color((long)gg.color.backgr);
-                hline(hw->x1, hw->x2, hw->y);
-        }
-        clipoff();
-        refreshsoon();
+	remcursor();
+	clipon();
+	t0 = sysclock();
+	while (labs(sysclock() - t0) < frytime)
+	{
+		m_color((long)gg.color.conflict);
+		hline(hw->x1, hw->x2, hw->y);
+		m_color((long)gg.color.backgr);
+		hline(hw->x1, hw->x2, hw->y);
+	}
+	clipoff();
+	refreshsoon();
 }
 
 
 void fryvwire(log_vwrec *vw)
 {
-        long t0;
+	long t0;
 
-        remcursor();
-        clipon();
-        t0 = timers_sysclock();
-        while (labs(timers_sysclock() - t0) < frytime)
-		{
-                m_color((long)gg.color.conflict);
-                vline(vw->x, vw->y1, vw->y2);
-                m_color((long)gg.color.backgr);
-                vline(vw->x, vw->y1, vw->y2);
-        }
-        clipoff();
-        refreshsoon();
+	remcursor();
+	clipon();
+	t0 = sysclock();
+	while (labs(sysclock() - t0) < frytime)
+	{
+		m_color((long)gg.color.conflict);
+		vline(vw->x, vw->y1, vw->y2);
+		m_color((long)gg.color.backgr);
+		vline(vw->x, vw->y1, vw->y2);
+	}
+	clipoff();
+	refreshsoon();
 }
 
-