diff --git a/src/ZT1Service.cpp b/src/ZT1Service.cpp
index 5468a6c..97dcdd4 100644
--- a/src/ZT1Service.cpp
+++ b/src/ZT1Service.cpp
@@ -39,6 +39,7 @@
 #include "OneService.hpp"
 #include "InetAddress.hpp"
 #include "OSUtils.hpp"
+#include "Mutex.hpp"
 
 std::vector<void*> vtaps;
 ZeroTier::Mutex _vtaps_lock;
diff --git a/test/selftest.cpp b/test/selftest.cpp
index ea6c8f7..d31b08e 100644
--- a/test/selftest.cpp
+++ b/test/selftest.cpp
@@ -142,13 +142,13 @@
 inline unsigned int gettid()
 {
 #ifdef _WIN32
-    return GetCurrentThreadId();
+	return GetCurrentThreadId();
 #elif defined(__unix__)
-    return static_cast<unsigned int>(::syscall(__NR_gettid));
+	return static_cast<unsigned int>(::syscall(__NR_gettid));
 #elif defined(__APPLE__)
-    uint64_t tid64;
-    pthread_threadid_np(NULL, &tid64);
-    return static_cast<unsigned int>(tid64);
+	uint64_t tid64;
+	pthread_threadid_np(NULL, &tid64);
+	return static_cast<unsigned int>(tid64);
 #endif
 }
 
@@ -381,7 +381,7 @@ void wait_until_everyone_is_ready(struct sockaddr *local_addr, struct sockaddr *
 			struct sockaddr_in client;
 			socklen_t client_addrlen = sizeof(sockaddr_in);
 			if ((accepted_fd = ACCEPT(listen_fd, (struct sockaddr *)&client, &client_addrlen)) < 0) { 
-				DEBUG_TEST("errno = %d", errno);
+				//DEBUG_TEST("errno = %d", errno);
 			}
 			else {
 				DEBUG_TEST("connected");
@@ -390,11 +390,9 @@ void wait_until_everyone_is_ready(struct sockaddr *local_addr, struct sockaddr *
 		}
 		sleep(1);
 	}
-	DEBUG_TEST("closing");
 	CLOSE(listen_fd);
 	CLOSE(conn_fd);
 	CLOSE(accepted_fd);
-	DEBUG_TEST("returning");
 }
 
 
@@ -2886,7 +2884,7 @@ for (int i=0; i<num_repeats; i++)
 		long int selftest_start_time = get_now_ts();
 		subtest_expected_duration = 20; // initial value, wait for other instance to come online
 #endif
-/*
+
 		// UDP 4 client/server
 
 		ipv = 4;
@@ -3059,12 +3057,9 @@ for (int i=0; i<num_repeats; i++)
 		}
 		RECORD_RESULTS(passed, details, &results);
 		port++;
-*/
-
 
 // IPV6
 
-/*
 		// UDP 6 client/server
 
 		ipv = 6;
@@ -3172,7 +3167,7 @@ for (int i=0; i<num_repeats; i++)
 		}
 		RECORD_RESULTS(passed, details, &results);
 		port++;
-*/
+
 	// TCP 6 sustained transfer
 
 		ipv = 6;