diff --git a/src/examples/ntester.cc b/src/examples/ntester.cc
index 97ad9c1..7fec181 100644
--- a/src/examples/ntester.cc
+++ b/src/examples/ntester.cc
@@ -36,7 +36,7 @@
 #include "user.h"
 #include "fatal_assert.h"
 #include "pty_compat.h"
-#include "networktransport.cc"
+#include "networktransport-impl.h"
 #include "select.h"
 
 using namespace Network;
diff --git a/src/examples/parse.cc b/src/examples/parse.cc
index 56aa171..faf4ca8 100644
--- a/src/examples/parse.cc
+++ b/src/examples/parse.cc
@@ -42,7 +42,6 @@
 #include <wchar.h>
 #include <assert.h>
 #include <wctype.h>
-#include <iostream>
 #include <typeinfo>
 #include <termios.h>
 
diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc
index a29c73a..c8ae0da 100644
--- a/src/examples/termemu.cc
+++ b/src/examples/termemu.cc
@@ -42,7 +42,6 @@
 #include <wchar.h>
 #include <assert.h>
 #include <wctype.h>
-#include <iostream>
 #include <typeinfo>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index 4a13496..a88a8d2 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -89,7 +89,7 @@
 #define _PATH_BSHELL "/bin/sh"
 #endif
 
-#include "networktransport.cc"
+#include "networktransport-impl.h"
 
 typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection;
 
diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
index 78c5625..e710dcf 100644
--- a/src/frontend/stmclient.cc
+++ b/src/frontend/stmclient.cc
@@ -60,7 +60,7 @@
 #include "select.h"
 #include "timestamp.h"
 
-#include "networktransport.cc"
+#include "networktransport-impl.h"
 
 void STMClient::resume( void )
 {
diff --git a/src/network/Makefile.am b/src/network/Makefile.am
index 3143cc4..74bca89 100644
--- a/src/network/Makefile.am
+++ b/src/network/Makefile.am
@@ -3,4 +3,4 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXF
 
 noinst_LIBRARIES = libmoshnetwork.a
 
-libmoshnetwork_a_SOURCES = network.cc network.h networktransport.cc networktransport.h transportfragment.cc transportfragment.h transportsender.cc transportsender.h transportstate.h compressor.cc compressor.h
+libmoshnetwork_a_SOURCES = network.cc network.h networktransport-impl.h networktransport.h transportfragment.cc transportfragment.h transportsender-impl.h transportsender.h transportstate.h compressor.cc compressor.h
diff --git a/src/network/networktransport.cc b/src/network/networktransport-impl.h
similarity index 99%
rename from src/network/networktransport.cc
rename to src/network/networktransport-impl.h
index 0e0bcf2..4073982 100644
--- a/src/network/networktransport.cc
+++ b/src/network/networktransport-impl.h
@@ -30,11 +30,9 @@
     also delete it here.
 */
 
-#include <iostream>
-
 #include "networktransport.h"
 
-#include "transportsender.cc"
+#include "transportsender-impl.h"
 
 using namespace Network;
 using namespace std;
diff --git a/src/network/transportsender.cc b/src/network/transportsender-impl.h
similarity index 100%
rename from src/network/transportsender.cc
rename to src/network/transportsender-impl.h