diff --git a/src/satterm_agent.cpp b/src/satterm_agent.cpp
index 7fc04a6..94b75ac 100644
--- a/src/satterm_agent.cpp
+++ b/src/satterm_agent.cpp
@@ -11,7 +11,6 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <iostream>                   // std::cout, std::cerr, std::endl.
-#include <fstream>                    // std::ifstream.
 #include <stdexcept>                  // std::out_of_range.
 #include <string>                     // std::string, std::to_string.
 #include <map>                        // std::map.
diff --git a/src/satterm_port.cpp b/src/satterm_port.cpp
index 4b1770a..0f739bd 100644
--- a/src/satterm_port.cpp
+++ b/src/satterm_port.cpp
@@ -19,7 +19,6 @@
 #include <stdio.h>                    // perror().
 #include <fcntl.h>                    // open() and O_RDONLY, O_WRONLY, etc.
 #include <unistd.h>                   // write(), read(), close(), unlink().
-#include <sys/stat.h>                 // mkfifo().
 #include <errno.h>                    // errno.
 
 #include "satterm_port.h"
diff --git a/src/satterm_port_client.cpp b/src/satterm_port_client.cpp
index 8a2016b..efeaef4 100644
--- a/src/satterm_port_client.cpp
+++ b/src/satterm_port_client.cpp
@@ -10,17 +10,7 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 // -----------------------------------------------------------------------------------------------------
 
-#include <iostream>                   // std::cout, std::cerr, std::endl;
-#include <string>                     // std::string, std::to_string.
-#include <map>                        // std::map.
-#include <vector>                     // std::vector.
-#include <ctime>                      // time().
-
 #include <signal.h>                   // SIGPIPE, SIG_IGN.
-#include <stdio.h>                    // perror().
-#include <fcntl.h>                    // open() and O_RDONLY, O_WRONLY, etc.
-#include <unistd.h>                   // write(), read(), close(), unlink().
-#include <sys/stat.h>                 // mkfifo().
 
 #include "satterm_port.h"
 
diff --git a/src/satterm_port_server.cpp b/src/satterm_port_server.cpp
index 0017bb1..6b71abf 100644
--- a/src/satterm_port_server.cpp
+++ b/src/satterm_port_server.cpp
@@ -12,14 +12,9 @@
 
 #include <iostream>                   // std::cout, std::cerr, std::endl;
 #include <string>                     // std::string, std::to_string.
-#include <map>                        // std::map.
-#include <vector>                     // std::vector.
-#include <ctime>                      // time().
 
 #include <signal.h>                   // SIGPIPE, SIG_IGN.
 #include <stdio.h>                    // perror().
-#include <fcntl.h>                    // open() and O_RDONLY, O_WRONLY, etc.
-#include <unistd.h>                   // write(), read(), close(), unlink().
 #include <sys/stat.h>                 // mkfifo().
 
 #include "satterm_port.h"
@@ -43,7 +38,6 @@ Port_Server::Port_Server(std::string const& working_path, std::string const& ide
 Port_Server::~Port_Server() {
 	Close();
 	if (m_fifos.in.created) {
-		// Unlink.
 		std::string fifo_path = m_working_path + m_fifos.in.identifier;
 		int status = unlink(fifo_path.c_str());
 		if ((status < 0) && m_display_messages) {
@@ -52,7 +46,6 @@ Port_Server::~Port_Server() {
 		}
 	}
 	if (m_fifos.out.created) {
-		// Unlink.
 		std::string fifo_path = m_working_path + m_fifos.out.identifier;
 		int status = unlink(fifo_path.c_str());
 		if ((status < 0) && m_display_messages) {
diff --git a/src/satterm_server.cpp b/src/satterm_server.cpp
index 6c858a9..6052409 100644
--- a/src/satterm_server.cpp
+++ b/src/satterm_server.cpp
@@ -19,11 +19,12 @@
 
 #include <errno.h>                    // errno.
 #include <unistd.h>                   // fork(), execl(), getcwd().
+#include <stdio.h>                    // perror(), FILENAME_MAX.
 
 #include "satellite_terminal.h"
 
 SatTerm_Server::SatTerm_Server(std::string const& identifier, std::string const& path_to_client_binary, bool display_messages,
-							   std::vector<std::string> port_identifiers, std::string const& stop_message,
+                               std::vector<std::string> port_identifiers, std::string const& stop_message,
                                std::string const& path_to_terminal_emulator_paths, char end_char, std::string const& stop_port_identifier,
                                unsigned long timeout_seconds) {
 	
diff --git a/src/satterm_struct.h b/src/satterm_struct.h
index 5e2178c..8f8884e 100644
--- a/src/satterm_struct.h
+++ b/src/satterm_struct.h
@@ -39,6 +39,7 @@ struct fifo_pair {
 struct error_descriptor {
 	int err_no;
 	std::string err_detail;
+	
 	error_descriptor& operator=(error_descriptor const& rhs) {
 		err_no = rhs.err_no;
 		err_detail = rhs.err_detail;