diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9fa4ab..d7feebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,6 @@ SET(MAIKO_DEFINITIONS
     "-DRELEASE=351"
 )
 
-IF(UNIX)
-  LIST(APPEND MAIKO_DEFINITIONS
-    "-DLOGINT"
-  )
-ENDIF()
-
 OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)
 IF(MAIKO_DISPLAY_X11)
   FIND_PACKAGE(X11 REQUIRED)
diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x
index 181c91a..a5951ab 100644
--- a/bin/makefile-cygwin.x86_64-x
+++ b/bin/makefile-cygwin.x86_64-x
@@ -20,7 +20,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DLOGINT $(XFLAGS) -DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x
index 85ee3a8..4112580 100644
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -19,8 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) \
-	-DLOGINT  $(XFLAGS) \
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \
 	-DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index 006e9a1..8611880 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -19,9 +19,7 @@ XFLAGS = -I/opt/local/include -DXWINDOW
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) \
-	-DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/opt/local/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/local/lib -lX11 -lm
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
index f369af9..60dd878 100644
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -19,9 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) \
-	-DLOGINT  $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x
index 54a1270..a81750c 100644
--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -19,8 +19,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O1 -gdwarf-2
-DFLAGS = -DLOGINT $(XFLAGS) \
-	-DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
diff --git a/bin/makefile-init.386 b/bin/makefile-init.386
index 1c60c1f..a32d3a2 100644
--- a/bin/makefile-init.386
+++ b/bin/makefile-init.386
@@ -18,8 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 
 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
-DFLAGS = -DLOGINT $(XFLAGS) \
-	-DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm
diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc
index 2ec03fe..a1dc539 100644
--- a/bin/makefile-init.sparc
+++ b/bin/makefile-init.sparc
@@ -47,7 +47,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
 MACHINEFLAGS = -DOS5 -DUSE_DLPI \
 		-I$(OPENWINHOME)/include \
-		-DLOGINT -DLOCK_X_UPDATES
+		-DLOCK_X_UPDATES
 
 # The LDEINIT wants to have NOVERSION set, so we don't hang up on
 # any change-over in versions.
diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x
index 27f8d41..659fc7c 100644
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DLOGINT $(XFLAGS) -DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x
index db1cd14..a280da8 100644
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DLOGINT $(XFLAGS) -DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x
index 181c91a..a5951ab 100644
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -20,7 +20,7 @@ XFLAGS = -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DLOGINT $(XFLAGS) -DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x
index b3b10ac..18a905c 100644
--- a/bin/makefile-openbsd.x86_64-x
+++ b/bin/makefile-openbsd.x86_64-x
@@ -19,7 +19,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW
 OEXT = .o
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = -DLOGINT $(XFLAGS) -DRELEASE=351
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm
diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x
index c9acceb..4498ff9 100644
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
  
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
-	-DOS5 -DLOGINT \
+	-DOS5 \
 	-DLOCK_X_UPDATES   \
 	-DRELEASE=351
 
diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x
index f6c065a..468d0dc 100644
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -38,7 +38,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	$(DEBUGFLAGS) \
 	-DOS5 -DUSE_DLPI \
-	-DLOGINT \
 	-DLOCK_X_UPDATES   \
 	-I$(OPENWINHOME)/include \
 	-DRELEASE=210
diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x
index fc88441..4888d98 100644
--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -42,7 +42,7 @@ OPTFLAGS =  -O2 -g3
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOGINT -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
 
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x
index 7d4f310..57ed9d7 100644
--- a/bin/makefile-sunos5.x86_64-x
+++ b/bin/makefile-sunos5.x86_64-x
@@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
  
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
-	-DOS5 -DLOGINT \
+	-DOS5 \
 	-DLOCK_X_UPDATES   \
 	-DUSE_DLPI \
 	-DRELEASE=351
diff --git a/src/keyevent.c b/src/keyevent.c
index 79f0bc2..464fe9a 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -348,7 +348,7 @@ getmore:
       rs232c_read();
 #endif /* RS232 */
 
-#ifdef LOGINT
+#if defined(MAIKO_HANDLE_CONSOLE_MESSAGES) && defined(LOGINT)
     if (LogFileFd >= 0 && FD_ISSET(LogFileFd, &rfds)) { /* There's info in the log file.  Tell Lisp to print it. */
       flush_pty();          /* move the msg(s) to the log file */
 
diff --git a/src/osmsg.c b/src/osmsg.c
index 7115da1..0e135af 100644
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -53,17 +53,19 @@
 #include <stropts.h>
 #endif
 
+#ifdef MAIKO_HANDLE_CONSOLE_MESSAGES
 #define MESSAGE_BUFFER_SIZE 1024
-int cons_tty;
-int cons_pty;
+static int cons_tty;
+static int cons_pty;
 
-char logfile[100];
-int log_id;
-int previous_size;
-int logChanged; /* T if log file has changed since last READ */
+static char logfile[100];
+static int log_id;
+static int previous_size;
+static int logChanged; /* T if log file has changed since last READ */
                 /* Set by flush_pty, to avoid the stat call  */
 int LogFileFd = -1;
 extern fd_set LispReadFds;
+#endif
 
 /************************************************************************/
 /*									*/