diff --git a/Makefile b/Makefile
index 61467d6..0b8894c 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ names.o: names.c names.h basic.h bind.h bindable.h buffer.h crypt.h \
  line.h utf8.h display.h eval.h exec.h retcode.h file.h isearch.h \
  region.h random.h search.h spawn.h window.h defines.h word.h
 pklock.o: pklock.c estruct.h pklock.h
-posix.o: posix.c termio.h
+posix.o: posix.c
 random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
  display.h estruct.h execute.h input.h bind.h log.h retcode.h search.h \
  terminal.h defines.h window.h
@@ -194,7 +194,7 @@ window.o: window.c window.h defines.h buffer.h crypt.h line.h utf8.h \
 word.o: word.c word.h basic.h buffer.h crypt.h line.h utf8.h estruct.h \
  log.h retcode.h random.h region.h window.h defines.h
 wrapper.o: wrapper.c wrapper.h
-wscreen.o: wscreen.c wscreen.h
+wscreen.o: wscreen.c
 
 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
diff --git a/posix.c b/posix.c
index b1a1ae4..932900f 100644
--- a/posix.c
+++ b/posix.c
@@ -1,4 +1,6 @@
-/* posix.c -- implements termio.h */
+/* posix.c -- posix implementation of termio.h */
+#ifdef POSIX
+
 #include "termio.h"
 
 /*	posix.c
@@ -13,8 +15,6 @@
  *	fixed for termios rather than the old termio.. Linus Torvalds
  */
 
-#ifdef POSIX
-
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/termio.c b/termio.c
index abb2620..e81a8d2 100644
--- a/termio.c
+++ b/termio.c
@@ -1,3 +1,6 @@
+/* termio.c -- implements termio.h */
+#if !defined( POSIX) && !defined( MINGW32)
+
 #include "termio.h"
 
 /*  TERMIO.C
@@ -9,8 +12,6 @@
  *  modified by Petri Kutvonen
  */
 
-#if !defined( POSIX) && !defined( MINGW32)
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/wscreen.c b/wscreen.c
index 45460d1..e8b43ea 100644
--- a/wscreen.c
+++ b/wscreen.c
@@ -1,8 +1,8 @@
-/* wscreen.c -- windows screen console */
-#include "wscreen.h"
-
+/* wscreen.c -- windows screen console for MINGW32 */
 #ifdef MINGW32
 
+#include "wscreen.h"
+
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -112,6 +112,6 @@ void wtitle( const char *title) {
     SetConsoleTitle( title) ;
 }
 
-#endif
+#endif /* MINGW32 */
 
 /* end of wscreen.c */