1 files changed, 18 insertions, 19 deletions

diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 8f1233e1..7f1a587e 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -14,22 +14,21 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Atom.hpp"
-#include "ingen/Configuration.hpp"
-#include "ingen/EngineBase.hpp"
-#include "ingen/FilePath.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/Message.hpp"
-#include "ingen/Parser.hpp"
-#include "ingen/URI.hpp"
-#include "ingen/World.hpp"
-#include "ingen/fmt.hpp"
-#include "ingen/paths.hpp"
-#include "ingen/runtime_paths.hpp"
-#include "ingen_config.h"
-#include "raul/Path.hpp"
-#include "raul/Symbol.hpp"
-#include "serd/serd.h"
+#include <ingen/Atom.hpp>
+#include <ingen/Configuration.hpp>
+#include <ingen/EngineBase.hpp>
+#include <ingen/Interface.hpp>
+#include <ingen/Message.hpp>
+#include <ingen/Parser.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/World.hpp>
+#include <ingen/fmt.hpp>
+#include <ingen/paths.hpp>
+#include <ingen/runtime_paths.hpp>
+#include <ingen_config.h>
+#include <raul/Path.hpp>
+#include <raul/Symbol.hpp>
+#include <serd/serd.h>
 
 #if USE_SOCKET
 #include "ingen/client/SocketClient.hpp"
@@ -132,7 +131,7 @@ run(int argc, char** argv)
 
 		ingen_try(world->load_module("server"), "Failed to load server module");
 
-		ingen_try(bool(world->engine()), "Unable to create engine");
+		ingen_try(!!world->engine(), "Unable to create engine");
 		world->engine()->listen();
 	}
 
@@ -196,14 +195,14 @@ run(int argc, char** argv)
 			}
 		}
 
-		ingen_try(bool(world->parser()), "Failed to create parser");
+		ingen_try(!!world->parser(), "Failed to create parser");
 
 		const std::string graph = conf.option("load").ptr<char>();
 
 		engine_interface->get(URI("ingen:/plugins"));
 		engine_interface->get(main_uri());
 
-		std::lock_guard<std::mutex> lock(world->rdf_mutex());
+		const std::lock_guard<std::mutex> lock{world->rdf_mutex()};
 		world->parser()->parse_file(
 			*world, *engine_interface, graph, parent, symbol);
 	} else if (conf.option("server-load").is_valid()) {