1 files changed, 14 insertions, 32 deletions

diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 9e907ffa..78b5ffac 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -22,22 +22,21 @@
 #include "State.hpp"
 #include "types.hpp"
 
-#include "ingen/LV2Features.hpp"
-#include "ingen/Properties.hpp"
-#include "ingen/URI.hpp"
-#include "lilv/lilv.h"
-#include "lv2/worker/worker.h"
-#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Noncopyable.hpp"
-
+#include <ingen/LV2Features.hpp>
+#include <lilv/lilv.h>
+#include <lv2/worker/worker.h>
+#include <raul/Array.hpp>
+#include <raul/Maid.hpp>
+#include <raul/Noncopyable.hpp>
+
+#include <boost/intrusive/options.hpp>
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/slist_hook.hpp>
-#include <boost/optional/optional.hpp>
 
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 #include <memory>
 #include <mutex>
 
@@ -45,33 +44,16 @@ namespace raul {
 class Symbol;
 } // namespace raul
 
-namespace boost {
-namespace intrusive {
-
-template <bool Enabled>
-struct cache_last;
-
-template <bool Enabled>
-struct constant_time_size;
-
-} // namespace intrusive
-} // namespace boost
-
 namespace ingen {
 
-class FilePath;
-class Resource;
 class URIs;
 class World;
 
 namespace server {
 
 class BufferFactory;
-class Engine;
 class GraphImpl;
 class LV2Plugin;
-class RunContext;
-class Worker;
 
 /** An instance of a LV2 plugin.
  *
@@ -91,7 +73,7 @@ public:
 	bool instantiate(BufferFactory& bufs, const LilvState* state);
 
 	LilvInstance* instance() override { return instance(0); }
-	bool          save_state(const FilePath& dir) const override;
+	bool          save_state(const std::filesystem::path& dir) const override;
 
 	BlockImpl* duplicate(Engine&             engine,
 	                     const raul::Symbol& symbol,
@@ -113,15 +95,15 @@ public:
 	void apply_state(const std::unique_ptr<Worker>& worker,
 	                 const LilvState*               state) override;
 
-	boost::optional<Resource> save_preset(const URI&        uri,
-	                                      const Properties& props) override;
+	std::optional<Resource> save_preset(const URI&        uri,
+	                                    const Properties& props) override;
 
 	void set_port_buffer(uint32_t         voice,
 	                     uint32_t         port_num,
 	                     const BufferRef& buf,
 	                     SampleCount      offset) override;
 
-	static StatePtr load_state(World& world, const FilePath& path);
+	static StatePtr load_state(World& world, const std::filesystem::path& path);
 
 protected:
 	struct Instance : public raul::Noncopyable {
@@ -135,7 +117,7 @@ protected:
 	std::shared_ptr<Instance>
 	make_instance(URIs& uris, SampleRate rate, uint32_t voice, bool preparing);
 
-	inline LilvInstance* instance(uint32_t voice) {
+	LilvInstance* instance(uint32_t voice) {
 		return static_cast<LilvInstance*>((*_instances)[voice]->instance);
 	}