diff --git a/lib/comms.cpp b/lib/comms.cpp
index 5c76925b..b0eb028d 100644
--- a/lib/comms.cpp
+++ b/lib/comms.cpp
@@ -1,13 +1,12 @@
 #include "auth.h"
-#include "bitfields.h"
 #include "comms.h"
 #include "defines.h"
-#include "encode.h"
 #include "stream.h"
 #include "procs.h"
 #include "timing.h"
 #include <fcntl.h>
 #include <string.h>
+#include <sstream>
 #include "config.h"
 
 namespace Comms{
diff --git a/lib/config.cpp b/lib/config.cpp
index f23aca67..c052dfb2 100644
--- a/lib/config.cpp
+++ b/lib/config.cpp
@@ -8,6 +8,18 @@
 #include "tinythread.h"
 #include <signal.h>
 #include <string.h>
+#include "procs.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h> //for getMyExec
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <iostream>
+#include <pwd.h>
+#include <stdarg.h> // for va_list
+#include <stdlib.h>
 
 #ifdef __CYGWIN__
 #include <windows.h>
@@ -21,21 +33,6 @@
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
 #endif
-#include "procs.h"
-#include <dirent.h> //for getMyExec
-#include <errno.h>
-#include <fcntl.h>
-#include <fstream>
-#include <getopt.h>
-#include <iostream>
-#include <pwd.h>
-#include <signal.h>
-#include <string.h>
-#include <stdarg.h> // for va_list
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 bool Util::Config::is_active = false;
 bool Util::Config::is_restarting = false;
diff --git a/lib/config.h b/lib/config.h
index bf1eed98..d5b66ce6 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -7,8 +7,8 @@
 #define PACKAGE_VERSION "unknown"
 #endif
 
+#include <sys/wait.h>
 #include "json.h"
-#include <signal.h>
 #include <string>
 
 /// Contains utility code, not directly related to streaming media
diff --git a/lib/dtsc.cpp b/lib/dtsc.cpp
index 4db8fa92..f28eb9d3 100644
--- a/lib/dtsc.cpp
+++ b/lib/dtsc.cpp
@@ -12,7 +12,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
-#include <iomanip>
+#include <sstream>
 
 namespace DTSC{
   char Magic_Header[] = "DTSC";
diff --git a/lib/h264.cpp b/lib/h264.cpp
index 1f9ad1b7..94d34bc3 100644
--- a/lib/h264.cpp
+++ b/lib/h264.cpp
@@ -7,6 +7,7 @@
 #include "h264.h"
 #include <cmath>
 #include <cstring>
+#include <sstream>
 #include <iomanip>
 
 namespace h264{
diff --git a/lib/hls_support.cpp b/lib/hls_support.cpp
index 66dc382a..ef0414cc 100644
--- a/lib/hls_support.cpp
+++ b/lib/hls_support.cpp
@@ -2,6 +2,7 @@
 #include "langcodes.h" /*LTS*/
 #include "stream.h"
 #include <cstdlib>
+#include <sstream>
 #include <iomanip>
 
 namespace HLS{
diff --git a/lib/http_parser.cpp b/lib/http_parser.cpp
index 98d591f7..c33a1297 100644
--- a/lib/http_parser.cpp
+++ b/lib/http_parser.cpp
@@ -11,6 +11,7 @@
 #include "json.h"
 #include <iomanip>
 #include <strings.h>
+#include <sstream>
 
 /// This constructor creates an empty HTTP::Parser, ready for use for either reading or writing.
 /// All this constructor does is call HTTP::Parser::Clean().
diff --git a/lib/sdp_media.cpp b/lib/sdp_media.cpp
index 3dd24fdd..90d8288a 100644
--- a/lib/sdp_media.cpp
+++ b/lib/sdp_media.cpp
@@ -2,6 +2,7 @@
 #include "sdp_media.h"
 #include <algorithm>
 #include <cstdarg>
+#include <sstream>
 
 namespace SDP{
 
diff --git a/lib/socket.cpp b/lib/socket.cpp
index c42e353f..cff98bca 100644
--- a/lib/socket.cpp
+++ b/lib/socket.cpp
@@ -5,7 +5,6 @@
 #include "defines.h"
 #include "socket.h"
 #include "timing.h"
-#include "json.h"
 #include <cstdlib>
 #include <ifaddrs.h>
 #include <netdb.h>
@@ -15,6 +14,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <fstream>
+#include <sys/select.h>
 
 #define BUFFER_BLOCKSIZE 4096 // set buffer blocksize to 4KiB
 
@@ -843,8 +843,8 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
     }
     DONTEVEN_MSG("SSL connect");
     int ret = 0;
-    if ((ret = mbedtls_net_connect(server_fd, host.c_str(), JSON::Value(port).asString().c_str(),
-                                   MBEDTLS_NET_PROTO_TCP)) != 0){
+    std::string portStr = uint2string(port);
+    if ((ret = mbedtls_net_connect(server_fd, host.c_str(), portStr.c_str(), MBEDTLS_NET_PROTO_TCP)) != 0){
       char estr[200];
       mbedtls_strerror(ret, estr, 200);
       lastErr = estr;
diff --git a/lib/socket.h b/lib/socket.h
index 871fa7e9..0b623a6b 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <arpa/inet.h>
 #include <deque>
-#include <errno.h>
 #include <fcntl.h>
-#include <sstream>
 #include <stdio.h>
 #include <string.h>
 #include <string>
diff --git a/lib/stun.cpp b/lib/stun.cpp
index bbec1ca4..140076d1 100644
--- a/lib/stun.cpp
+++ b/lib/stun.cpp
@@ -1,7 +1,8 @@
 #include "checksum.h" // for crc32
 #include "defines.h"
 #include "stun.h"
-#include "socket.h"
+#include <sstream>
+#include <socket.h>
 
 /* --------------------------------------- */
 
diff --git a/lib/timing.cpp b/lib/timing.cpp
index 2834667b..8d7d88e8 100644
--- a/lib/timing.cpp
+++ b/lib/timing.cpp
@@ -7,7 +7,6 @@
 #include <sys/time.h> //for gettimeofday
 #include <sys/stat.h>
 #include <time.h>     //for time and nanosleep
-#include <sstream>
 #include <stdlib.h>
 
 // emulate clock_gettime() for OSX compatibility
diff --git a/lib/util.cpp b/lib/util.cpp
index 4c561069..204ff2e1 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -12,6 +12,7 @@
 #include <errno.h> // errno, ENOENT, EEXIST
 #include <iomanip>
 #include <iostream>
+#include <sstream>
 #include <stdio.h>
 #include <sys/stat.h> // stat
 #if defined(_WIN32)
diff --git a/src/analysers/analyser_dtsc.cpp b/src/analysers/analyser_dtsc.cpp
index 95f2c5a9..6dd9fc2d 100644
--- a/src/analysers/analyser_dtsc.cpp
+++ b/src/analysers/analyser_dtsc.cpp
@@ -1,5 +1,6 @@
 #include "analyser_dtsc.h"
 #include <iomanip>
+#include <sstream>
 #include <mist/h264.h>
 
 void AnalyserDTSC::init(Util::Config &conf){
diff --git a/src/analysers/analyser_hls.cpp b/src/analysers/analyser_hls.cpp
index 18902ec5..67409fbf 100644
--- a/src/analysers/analyser_hls.cpp
+++ b/src/analysers/analyser_hls.cpp
@@ -1,12 +1,10 @@
 #include "analyser_hls.h"
-#include <cstdio>
 #include <cstdlib>
-#include <iostream>
+#include <sstream>
 #include <mist/config.h>
 #include <mist/defines.h>
 #include <mist/http_parser.h>
 #include <mist/timing.h>
-#include <string.h>
 
 void AnalyserHLS::init(Util::Config &conf){
   Analyser::init(conf);
diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp
index c1ee6b45..e05b99d5 100644
--- a/src/controller/controller.cpp
+++ b/src/controller/controller.cpp
@@ -28,13 +28,9 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h> //for shm space check
 #include <sys/wait.h>
-#include <vector>
-/*LTS-START*/
-#include "controller_limits.h"
 #include "controller_updater.h"
 #include "controller_uplink.h"
 #include <mist/triggers.h>
-/*LTS-END*/
 
 #ifndef COMPILED_USERNAME
 #define COMPILED_USERNAME ""
diff --git a/src/controller/controller_api.cpp b/src/controller/controller_api.cpp
index bc11c613..0d40c284 100644
--- a/src/controller/controller_api.cpp
+++ b/src/controller/controller_api.cpp
@@ -7,6 +7,7 @@
 #include "controller_external_writers.h"
 #include <dirent.h> //for browse API call
 #include <fstream>
+#include <sstream>
 #include <mist/auth.h>
 #include <mist/bitfields.h>
 #include <mist/config.h>
diff --git a/src/controller/controller_statistics.cpp b/src/controller/controller_statistics.cpp
index a0310b0c..dabc1d36 100644
--- a/src/controller/controller_statistics.cpp
+++ b/src/controller/controller_statistics.cpp
@@ -5,6 +5,7 @@
 #include "controller_storage.h"
 #include <cstdio>
 #include <fstream>
+#include <sstream>
 #include <list>
 #include <mist/bitfields.h>
 #include <mist/config.h>
diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp
index 6fa15510..0007ecd1 100644
--- a/src/input/input_buffer.cpp
+++ b/src/input/input_buffer.cpp
@@ -1,11 +1,10 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <iostream>
+#include <sstream>
 #include <mist/bitfields.h>
 #include <mist/defines.h>
 #include <mist/langcodes.h>
diff --git a/src/input/input_hls.cpp b/src/input/input_hls.cpp
index cda04feb..2b7e2636 100644
--- a/src/input/input_hls.cpp
+++ b/src/input/input_hls.cpp
@@ -19,7 +19,6 @@
 #include <mist/ts_packet.h>
 #include <string>
 #include <sys/stat.h>
-#include <vector>
 
 #define SEM_TS_CLAIM "/MstTSIN%s"
 
diff --git a/src/input/input_hls.h b/src/input/input_hls.h
index b296f329..0161f734 100644
--- a/src/input/input_hls.h
+++ b/src/input/input_hls.h
@@ -1,13 +1,10 @@
 #pragma once
 #include "input.h"
-#include <fstream>
 #include <mist/dtsc.h>
 #include <mist/nal.h>
 #include <mist/ts_packet.h>
 #include <mist/ts_stream.h>
-#include <set>
 #include <string>
-#include <vector>
 //#include <stdint.h>
 #include <mist/http_parser.h>
 #include <mist/urireader.h>
diff --git a/src/io.cpp b/src/io.cpp
index b0f06835..88896798 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -1,5 +1,6 @@
 #include "io.h"
 #include <cstdlib>
+#include <sstream>
 #include <mist/auth.h>
 #include <mist/bitfields.h>
 #include <mist/encode.h>
diff --git a/src/io.h b/src/io.h
index cef6b7db..20ad69bf 100644
--- a/src/io.h
+++ b/src/io.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <deque>
 #include <map>
 #include <mist/comms.h>
 #include <mist/defines.h>
 #include <mist/dtsc.h>
 #include <mist/shared_memory.h>
 
-#include <mist/encryption.h> //LTS
 namespace Mist{
   ///\brief Class containing all basic input and output functions.
   class InOutBase{
diff --git a/src/output/output.cpp b/src/output/output.cpp
index 76772af3..6ad37cd8 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -8,6 +8,7 @@
 #include <unistd.h>
 #include <iomanip>
 #include <fstream>
+#include <sstream>
 
 #include "output.h" 
 #include <mist/bitfields.h>
diff --git a/src/output/output_dtsc.cpp b/src/output/output_dtsc.cpp
index c0b34edd..63c2030b 100644
--- a/src/output/output_dtsc.cpp
+++ b/src/output/output_dtsc.cpp
@@ -1,6 +1,7 @@
 #include "output_dtsc.h"
 #include <cstdlib>
 #include <cstring>
+#include <sstream>
 #include <mist/auth.h>
 #include <mist/bitfields.h>
 #include <mist/defines.h>
diff --git a/src/output/output_ebml.cpp b/src/output/output_ebml.cpp
index f32473f0..dc7005f8 100644
--- a/src/output/output_ebml.cpp
+++ b/src/output/output_ebml.cpp
@@ -2,6 +2,7 @@
 #include <mist/ebml_socketglue.h>
 #include <mist/opus.h>
 #include <mist/riff.h>
+#include <sstream>
 
 namespace Mist{
   OutEBML::OutEBML(Socket::Connection &conn) : HTTPOutput(conn){
diff --git a/src/output/output_http.cpp b/src/output/output_http.cpp
index e87e66b3..054defd5 100644
--- a/src/output/output_http.cpp
+++ b/src/output/output_http.cpp
@@ -6,6 +6,7 @@
 #include <mist/util.h>
 #include <mist/url.h>
 #include <set>
+#include <sstream>
 #include <sys/stat.h>
 
 namespace Mist{
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 792ce1f0..ceadfa91 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -1,6 +1,7 @@
 #include "output_rtmp.h"
 #include <cstdlib>
 #include <cstring>
+#include <sstream>
 #include <mist/auth.h>
 #include <mist/bitfields.h>
 #include <mist/defines.h>
diff --git a/src/output/output_srt.cpp b/src/output/output_srt.cpp
index b4e8c6c2..aaa65897 100644
--- a/src/output/output_srt.cpp
+++ b/src/output/output_srt.cpp
@@ -1,5 +1,5 @@
 #include "output_srt.h"
-#include <iomanip>
+#include <sstream>
 #include <mist/checksum.h>
 #include <mist/defines.h>
 #include <mist/http_parser.h>
diff --git a/src/output/output_webrtc.h b/src/output/output_webrtc.h
index 68d0fa7b..2452c8f7 100644
--- a/src/output/output_webrtc.h
+++ b/src/output/output_webrtc.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "output.h"
 #include "output_http.h"
 #include <mist/certificate.h>
 #include <mist/h264.h>
diff --git a/src/session.cpp b/src/session.cpp
index 1d479d27..6eebc16d 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -7,6 +7,7 @@
 #include <mist/triggers.h>
 #include <signal.h>
 #include <stdio.h>
+#include <sstream>
 
 // Global counters
 uint64_t thisType = 0;