1 files changed, 17 insertions, 16 deletions
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 83854bf9..5499fb66 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -14,18 +14,18 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/SocketReader.hpp"
-
-#include "ingen/AtomForge.hpp"
-#include "ingen/AtomReader.hpp"
-#include "ingen/Log.hpp"
-#include "ingen/URIMap.hpp"
-#include "ingen/World.hpp"
-#include "lv2/urid/urid.h"
-#include "raul/Socket.hpp"
-#include "serd/serd.h"
-#include "sord/sord.h"
-#include "sord/sordmm.hpp"
+#include <ingen/SocketReader.hpp>
+
+#include <ingen/AtomForge.hpp>
+#include <ingen/AtomReader.hpp>
+#include <ingen/Log.hpp>
+#include <ingen/URIMap.hpp>
+#include <ingen/World.hpp>
+#include <lv2/urid/urid.h>
+#include <raul/Socket.hpp>
+#include <serd/serd.h>
+#include <sord/sord.h>
+#include <sord/sordmm.hpp>
 
 #include <cerrno>
 #include <cstdint>
@@ -33,6 +33,7 @@
 #include <mutex>
 #include <poll.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <utility>
 
 namespace ingen {
@@ -123,7 +124,7 @@ SocketReader::run()
 	AtomForge  forge(map);
 	{
 		// Lock RDF world
-		std::lock_guard<std::mutex> lock(_world.rdf_mutex());
+		const std::lock_guard<std::mutex> lock{_world.rdf_mutex()};
 
 		// Use <ingen:/> as base URI, so relative URIs are like bundle paths
 		base_uri = sord_new_uri(world->c_obj(),
@@ -174,10 +175,10 @@ SocketReader::run()
 		}
 
 		// Lock RDF world
-		std::lock_guard<std::mutex> lock(_world.rdf_mutex());
+		const std::lock_guard<std::mutex> lock{_world.rdf_mutex()};
 
 		// Read until the next '.'
-		SerdStatus st = serd_reader_read_chunk(reader);
+		const SerdStatus st = serd_reader_read_chunk(reader);
 		if (st == SERD_FAILURE || !_msg_node) {
 			continue; // Read nothing, e.g. just whitespace
 		}
@@ -200,7 +201,7 @@ SocketReader::run()
 	}
 
 	// Lock RDF world
-	std::lock_guard<std::mutex> lock(_world.rdf_mutex());
+	const std::lock_guard<std::mutex> lock{_world.rdf_mutex()};
 
 	// Destroy everything
 	sord_inserter_free(_inserter);