1 files changed, 12 insertions, 9 deletions
diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp
index fba2e434..48955143 100644
--- a/src/server/ingen_engine.cpp
+++ b/src/server/ingen_engine.cpp
@@ -15,18 +15,19 @@
 */
 
 #include "Engine.hpp"
-#include "EventWriter.hpp"
 #include "util.hpp"
 
-#include "ingen/Module.hpp"
-#include "ingen/World.hpp"
+#include <ingen/Module.hpp>
+#include <ingen/World.hpp>
 
-using namespace ingen;
+#include <memory>
 
-struct IngenEngineModule : public ingen::Module {
-	void load(ingen::World& world) override {
+namespace ingen {
+
+struct EngineModule : public Module {
+	void load(World& world) override {
 		server::set_denormal_flags(world.log());
-		SPtr<server::Engine> engine(new server::Engine(world));
+		auto engine = std::make_shared<server::Engine>(world);
 		world.set_engine(engine);
 		if (!world.interface()) {
 			world.set_interface(engine->interface());
@@ -34,12 +35,14 @@ struct IngenEngineModule : public ingen::Module {
 	}
 };
 
+} // namespace ingen
+
 extern "C" {
 
-ingen::Module*
+INGEN_MODULE_EXPORT ingen::Module*
 ingen_module_load()
 {
-	return new IngenEngineModule();
+	return new ingen::EngineModule();
 }
 
 } // extern "C"