diff --git a/Makefile.in b/Makefile.in
index 115af9c5a..76531d443 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,11 +46,11 @@ TARGET = nmap
 TARGETNMAPFE=@TARGETNMAPFE@
 INSTALLNMAPFE=@INSTALLNMAPFE@
 
-export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc tty.cc nmap_dns.cc @COMPAT_SRCS@
+export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc @COMPAT_SRCS@
 
-OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o output.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o tty.o nmap_dns.o @COMPAT_OBJS@
+OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o output.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o @COMPAT_OBJS@
 
-export DEPS = nmap.h nmap_amigaos.h nmap_error.h targets.h idle_scan.h osscan.h output.h scan_engine.h timing.h tcpip.h utils.h global_structures.h charpool.h services.h protocols.h nmap_rpc.h portlist.h NmapOps.h TargetGroup.h Target.h FingerPrintResults.h service_scan.h NmapOutputTable.h MACLookup.h tty.h nmap_dns.h
+export DEPS = nmap.h nmap_amigaos.h nmap_error.h targets.h idle_scan.h osscan.h output.h scan_engine.h timing.h tcpip.h utils.h global_structures.h charpool.h services.h protocols.h nmap_rpc.h portlist.h NmapOps.h TargetGroup.h Target.h FingerPrintResults.h service_scan.h NmapOutputTable.h MACLookup.h nmap_tty.h nmap_dns.h
 
 
 # %.o : %.cc -- nope this is a GNU extension
diff --git a/nmap.cc b/nmap.cc
index 61c4136d8..5deb62de4 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -107,7 +107,7 @@
 #include "timing.h"
 #include "NmapOps.h"
 #include "MACLookup.h"
-#include "tty.h"
+#include "nmap_tty.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif
diff --git a/nmap_dns.cc b/nmap_dns.cc
index 6bcd33c88..d916f401e 100644
--- a/nmap_dns.cc
+++ b/nmap_dns.cc
@@ -161,7 +161,7 @@
 #include "nmap_dns.h"
 #include "nsock.h"
 #include "utils.h"
-#include "tty.h"
+#include "nmap_tty.h"
 
 extern NmapOps o;
 
diff --git a/tty.cc b/nmap_tty.cc
similarity index 98%
rename from tty.cc
rename to nmap_tty.cc
index 56a4c7493..bfab2832f 100644
--- a/tty.cc
+++ b/nmap_tty.cc
@@ -1,6 +1,6 @@
 /***************************************************************************
- * tty.cc -- Handles runtime interaction with Nmap, so you can increase    *
- * verbosity/debugging or obtain a status line upon request.               *
+ * nmap_tty.cc -- Handles runtime interaction with Nmap, so you can        *
+ * increase verbosity/debugging or obtain a status line upon request.      *
  *                                                                         *
  ***********************IMPORTANT NMAP LICENSE TERMS************************
  *                                                                         *
@@ -116,7 +116,7 @@
 #include <stdlib.h>
 
 #include "output.h"
-#include "tty.h"
+#include "nmap_tty.h"
 #include "NmapOps.h"
 
 extern NmapOps o;
diff --git a/tty.h b/nmap_tty.h
similarity index 98%
rename from tty.h
rename to nmap_tty.h
index cdb181eb1..79d074460 100644
--- a/tty.h
+++ b/nmap_tty.h
@@ -1,6 +1,6 @@
 /***************************************************************************
- * tty.h -- Handles runtime interaction with Nmap, so you can increase     *
- * verbosity/debugging or obtain a status line upon request.               *
+ * nmap_tty.h -- Handles runtime interaction with Nmap, so you can         *
+ * increase verbosity/debugging or obtain a status line upon request.      *
  *                                                                         *
  ***********************IMPORTANT NMAP LICENSE TERMS************************
  *                                                                         *
diff --git a/osscan.cc b/osscan.cc
index ba9248c6b..774493626 100644
--- a/osscan.cc
+++ b/osscan.cc
@@ -104,7 +104,7 @@
 #include "osscan.h"
 #include "timing.h"
 #include "NmapOps.h"
-#include "tty.h"
+#include "nmap_tty.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
diff --git a/scan_engine.cc b/scan_engine.cc
index 9463cf843..01ad9b081 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -105,7 +105,7 @@
 #include "scan_engine.h"
 #include "timing.h"
 #include "NmapOps.h"
-#include "tty.h"
+#include "nmap_tty.h"
 #include <dnet.h>
 #include <list>
 
diff --git a/service_scan.cc b/service_scan.cc
index 27173345b..730b6b31a 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -106,7 +106,7 @@
 #include "NmapOps.h"
 #include "nsock.h"
 
-#include "tty.h"
+#include "nmap_tty.h"
 
 #if HAVE_OPENSSL
 #include <openssl/ssl.h>
diff --git a/targets.cc b/targets.cc
index 35e76a470..b556c7074 100644
--- a/targets.cc
+++ b/targets.cc
@@ -109,7 +109,7 @@
 #include "Target.h"
 #include "scan_engine.h"
 #include "nmap_dns.h"
-#include "tty.h"
+#include "nmap_tty.h"
 
 using namespace std;
 extern NmapOps o;