diff --git a/src/Makefile.am b/src/Makefile.am
index 206cdb6..f5fa4fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = ttynvt
 
 ttynvt_SOURCES = \
 	ttynvt.c \
-	telnet_basic.c telnet_rfc2217.c telnet.h telnet_param.h
+	telnet_basic.c telnet_client_rfc2217.c telnet.h telnet_param.h
 
 ttynvt_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(FUSE_CFLAGS) $(CFLAGS_WARN)
 
diff --git a/src/telnet.h b/src/telnet.h
index 213335e..6f3b21a 100644
--- a/src/telnet.h
+++ b/src/telnet.h
@@ -2,10 +2,10 @@
  * Copyright (c) 2018 Lars Thrane A/S
  * SPDX-License-Identifier: GPL-2.0
  *
- * Telnet interface
+ * Telnet interface - client
  */
-#ifndef TELNET_H
-#define TELNET_H
+#ifndef TELNET_CLIENT_H
+#define TELNET_CLIENT_H
 
 typedef int     (srv_tx_f) (void *cctx, const void *buf, int len);
 typedef int     (srv_rx_f) (void *cctx, int timeout);
@@ -68,4 +68,4 @@ extern void     telnet_rfc2217_ctl(tn_ctx_t * tcc, unsigned int val);
 #define TNS_CTL_RTS_OFF    12
 #define TNS_CTL_XONOFF_IN  15
 
-#endif /*TELNET_H */
+#endif /* TELNET_CLIENT_H */
diff --git a/src/telnet_basic.c b/src/telnet_basic.c
index 4653ba7..8098a8f 100644
--- a/src/telnet_basic.c
+++ b/src/telnet_basic.c
@@ -2,9 +2,8 @@
  * Copyright (c) 2018 Lars Thrane A/S
  * SPDX-License-Identifier: GPL-2.0
  *
- * Telnet server - Telnet protocol handling
+ * Telnet protocol handling - client
  */
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/src/telnet_rfc2217.c b/src/telnet_client_rfc2217.c
similarity index 95%
rename from src/telnet_rfc2217.c
rename to src/telnet_client_rfc2217.c
index 9a893f1..9db596d 100644
--- a/src/telnet_rfc2217.c
+++ b/src/telnet_client_rfc2217.c
@@ -2,11 +2,8 @@
  * Copyright (c) 2018 Lars Thrane A/S
  * SPDX-License-Identifier: GPL-2.0
  *
- * Telnet server - RFC-2217 handling
+ * Telnet RFC-2217 handling - client
  */
-
-#include <stddef.h>
-
 #include "telnet.h"
 #include "telnet_param.h"