summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-02 13:33:36 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 13:34:05 +0200
commitb8128027fcf79ece3ed973627dd4e76eb36b5997 (patch)
tree318f7812380bf4aa040aca456f0608d33146e3ad /src
parent2adde205908ae64390241ebdaf871264ad30e33b (diff)
downloadingen-b8128027fcf79ece3ed973627dd4e76eb36b5997.tar.gz
ingen-b8128027fcf79ece3ed973627dd4e76eb36b5997.tar.bz2
ingen-b8128027fcf79ece3ed973627dd4e76eb36b5997.zip
Rename memory utility header
Diffstat (limited to 'src')
-rw-r--r--src/Serialiser.cpp2
-rw-r--r--src/gui/App.hpp2
-rw-r--r--src/gui/Arc.hpp2
-rw-r--r--src/gui/BreadCrumbs.hpp2
-rw-r--r--src/gui/ConnectWindow.hpp2
-rw-r--r--src/gui/GraphBox.hpp2
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/GraphView.hpp2
-rw-r--r--src/gui/GraphWindow.hpp2
-rw-r--r--src/gui/LoadGraphWindow.hpp2
-rw-r--r--src/gui/LoadPluginWindow.hpp2
-rw-r--r--src/gui/NewSubgraphWindow.hpp2
-rw-r--r--src/gui/NodeMenu.hpp2
-rw-r--r--src/gui/NodeModule.hpp2
-rw-r--r--src/gui/ObjectMenu.hpp2
-rw-r--r--src/gui/PluginMenu.hpp2
-rw-r--r--src/gui/Port.hpp2
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/PortMenu.hpp2
-rw-r--r--src/gui/PropertiesWindow.hpp2
-rw-r--r--src/gui/RDFS.hpp2
-rw-r--r--src/gui/RenameWindow.hpp2
-rw-r--r--src/gui/SubgraphModule.hpp2
-rw-r--r--src/gui/WindowFactory.hpp2
-rw-r--r--src/gui/ingen_gui_lv2.cpp2
-rw-r--r--src/ingen/ingen.cpp2
-rw-r--r--src/server/BlockFactory.hpp2
-rw-r--r--src/server/Broadcaster.hpp2
-rw-r--r--src/server/Buffer.hpp2
-rw-r--r--src/server/ClientUpdate.cpp2
-rw-r--r--src/server/CompiledGraph.hpp2
-rw-r--r--src/server/ControlBindings.hpp2
-rw-r--r--src/server/DuplexPort.cpp2
-rw-r--r--src/server/Engine.cpp2
-rw-r--r--src/server/Engine.hpp2
-rw-r--r--src/server/Event.hpp2
-rw-r--r--src/server/EventWriter.hpp2
-rw-r--r--src/server/GraphImpl.hpp2
-rw-r--r--src/server/InputPort.hpp2
-rw-r--r--src/server/JackDriver.hpp2
-rw-r--r--src/server/RunContext.hpp2
-rw-r--r--src/server/Worker.cpp2
-rw-r--r--src/server/Worker.hpp2
-rw-r--r--src/server/events/CreateGraph.hpp2
-rw-r--r--src/server/ingen_lv2.cpp2
-rw-r--r--src/server/ingen_portaudio.cpp2
46 files changed, 46 insertions, 46 deletions
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index 6632a2e7..2ab0f039 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -29,8 +29,8 @@
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
#include "ingen/filesystem.hpp"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/core/lv2.h"
#include "lv2/state/state.h"
#include "lv2/ui/ui.h"
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 2e45880d..0b504361 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -23,7 +23,7 @@
#include "ingen/Status.hpp"
#include "ingen/World.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "raul/Deletable.hpp"
diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp
index 7e33384b..a20c4e5f 100644
--- a/src/gui/Arc.hpp
+++ b/src/gui/Arc.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_ARC_HPP
#include "ganv/Edge.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cassert>
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 803a72f4..d62a7ee0 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -21,7 +21,7 @@
#include "ingen/Message.hpp"
#include "ingen/client/GraphModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Path.hpp"
#include <gtkmm/box.h>
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 481e4d83..f350e97d 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/Message.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <gtkmm/builder.h>
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index 7978d573..e2a1ce98 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -29,7 +29,7 @@
#include <gtkmm/statusbar.h>
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "Window.hpp"
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 9e6c4760..658e0f96 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -23,7 +23,7 @@
#include "ganv/Module.hpp"
#include "ingen/Node.hpp"
#include "ingen/client/ArcModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include "raul/Path.hpp"
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index fc7356f3..0a4a6d21 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_GUI_GRAPHVIEW_HPP
#define INGEN_GUI_GRAPHVIEW_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/box.h>
#include <gtkmm/builder.h>
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index cca283d3..795f0925 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -20,7 +20,7 @@
#include "GraphBox.hpp"
#include "Window.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index 03b96f72..7b26eb7d 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_LOADGRAPHWINDOW_HPP
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index f65dfff5..b9cfaf28 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -21,7 +21,7 @@
#include "ingen/Node.hpp"
#include "ingen/client/ClientStore.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "ingen_config.h"
#include <gtkmm/builder.h>
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 2d249cf3..69c35d05 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index 8bc820e8..a997e03f 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -20,7 +20,7 @@
#include "ObjectMenu.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/menu.h>
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 81067fbd..d4b845cf 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_NODEMODULE_HPP
#include "ganv/Module.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "Port.hpp"
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index 22eef74b..8714917e 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_OBJECTMENU_HPP
#include "ingen/client/ObjectModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/checkmenuitem.h>
diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp
index 6c7aa6b0..a701de74 100644
--- a/src/gui/PluginMenu.hpp
+++ b/src/gui/PluginMenu.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_PLUGINMENU_HPP
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <gtkmm/menu.h>
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index ce1224ab..72b91b2e 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_PORT_HPP
#include "ganv/Port.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/menu.h>
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 2fc8ec2e..fc25e1c1 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/PortModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <memory>
#include <string>
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 26298e76..8cb069f7 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -20,7 +20,7 @@
#include "ObjectMenu.hpp"
#include "ingen/client/PortModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/menu.h>
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 81e29ae1..015c0a93 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/alignment.h>
#include <gtkmm/box.h>
diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp
index a8d161cb..d2812bc0 100644
--- a/src/gui/RDFS.hpp
+++ b/src/gui/RDFS.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_RDF_HPP
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lilv/lilv.h"
#include <map>
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 3b50f04e..2ea2d897 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -20,7 +20,7 @@
#include "Window.hpp"
#include "ingen/client/ObjectModel.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 24b63a27..1571c2ee 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_GUI_SUBGRAPHMODULE_HPP
#define INGEN_GUI_SUBGRAPHMODULE_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "GraphPortModule.hpp"
#include "NodeModule.hpp"
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index e6eeb449..77d84ac6 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -18,7 +18,7 @@
#define INGEN_GUI_WINDOWFACTORY_HPP
#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstddef>
#include <map>
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index ce33f2ac..c90efa4b 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -30,9 +30,9 @@
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/SigClientInterface.hpp"
#include "ingen/ingen.h"
+#include "ingen/memory.hpp"
#include "ingen/paths.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/atom/atom.h"
#include "lv2/atom/util.h"
#include "lv2/core/lv2.h"
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 3a1ebc8f..948e80dd 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -20,9 +20,9 @@
#include "ingen/Log.hpp"
#include "ingen/Parser.hpp"
#include "ingen/World.hpp"
+#include "ingen/memory.hpp"
#include "ingen/paths.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "ingen_config.h"
#include "raul/Path.hpp"
#include "raul/Symbol.hpp"
diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp
index 234a20fa..aff2e9f4 100644
--- a/src/server/BlockFactory.hpp
+++ b/src/server/BlockFactory.hpp
@@ -18,7 +18,7 @@
#define INGEN_ENGINE_BLOCKFACTORY_HPP
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Noncopyable.hpp"
#include <map>
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 1a45a83d..c766ceed 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Message.hpp"
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Noncopyable.hpp"
#include <atomic>
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index 7593900e..b1ec1c68 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -24,7 +24,7 @@
#include "ingen/URIs.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/atom.h"
#include "lv2/urid/urid.h"
diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp
index 0c0f9203..f0eaa1bf 100644
--- a/src/server/ClientUpdate.cpp
+++ b/src/server/ClientUpdate.cpp
@@ -29,7 +29,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Node.hpp"
#include "ingen/URIs.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <algorithm>
#include <cstddef>
diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp
index d2815bff..9a06a7c9 100644
--- a/src/server/CompiledGraph.hpp
+++ b/src/server/CompiledGraph.hpp
@@ -19,7 +19,7 @@
#include "Task.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Maid.hpp"
#include "raul/Noncopyable.hpp"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 92128cb6..f465775b 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -19,7 +19,7 @@
#include "BufferRef.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/forge.h"
#include "raul/Maid.hpp"
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 7ba466a7..ec33459b 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -29,7 +29,7 @@
#include "ingen/Node.hpp"
#include "ingen/Properties.hpp"
#include "ingen/URIs.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Array.hpp"
#include <algorithm>
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index cfe9757a..fb600644 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -48,7 +48,7 @@
#include "ingen/Tee.hpp"
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/buf-size/buf-size.h"
#include "lv2/state/state.h"
#include "raul/Maid.hpp"
diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp
index 9162f12f..08ecac98 100644
--- a/src/server/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -25,7 +25,7 @@
#include "ingen/EngineBase.hpp"
#include "ingen/Properties.hpp"
#include "ingen/ingen.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <chrono>
#include <condition_variable>
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index 8fc71be1..93c175b8 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -22,7 +22,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Node.hpp"
#include "ingen/Status.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "raul/Deletable.hpp"
#include "raul/Noncopyable.hpp"
#include "raul/Path.hpp"
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index f0499f10..3bf1d03b 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -23,7 +23,7 @@
#include "ingen/Interface.hpp"
#include "ingen/Message.hpp"
#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
namespace ingen {
namespace server {
diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp
index 0ca5b8dd..455e9c8a 100644
--- a/src/server/GraphImpl.hpp
+++ b/src/server/GraphImpl.hpp
@@ -21,7 +21,7 @@
#include "DuplexPort.hpp"
#include "ThreadManager.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/urid/urid.h"
#include <cassert>
diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp
index dfe8b92a..ad8b10a4 100644
--- a/src/server/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -22,7 +22,7 @@
#include "PortType.hpp"
#include "types.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/urid/urid.h"
#include <boost/intrusive/options.hpp>
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index ecaaec5f..34d25f65 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -21,7 +21,7 @@
#include "EnginePort.hpp"
#include "ingen_config.h"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/atom/forge.h"
#include "raul/Semaphore.hpp"
diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp
index 7859d545..cf2bfe10 100644
--- a/src/server/RunContext.hpp
+++ b/src/server/RunContext.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_ENGINE_RUNCONTEXT_HPP
#define INGEN_ENGINE_RUNCONTEXT_HPP
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "types.hpp"
#include "lv2/urid/urid.h"
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index 8e6bcb26..69f9eec6 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -21,7 +21,7 @@
#include "LV2Block.hpp"
#include "ingen/Log.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/worker/worker.h"
#include <cstdlib>
diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp
index 2e4a965f..ae7e9f1e 100644
--- a/src/server/Worker.hpp
+++ b/src/server/Worker.hpp
@@ -18,7 +18,7 @@
#define INGEN_ENGINE_WORKER_HPP
#include "ingen/LV2Features.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include "lv2/worker/worker.h"
#include "raul/RingBuffer.hpp"
#include "raul/Semaphore.hpp"
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 4ab3f4af..b755d8f2 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -21,7 +21,7 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
#include <cstdint>
#include <list>
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index a38be08b..9b66fe7c 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -43,8 +43,8 @@
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
#include "ingen/ingen.h"
+#include "ingen/memory.hpp"
#include "ingen/runtime_paths.hpp"
-#include "ingen/types.hpp"
#include "lv2/atom/atom.h"
#include "lv2/atom/util.h"
#include "lv2/buf-size/buf-size.h"
diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp
index 81f6e65c..f5d95fb0 100644
--- a/src/server/ingen_portaudio.cpp
+++ b/src/server/ingen_portaudio.cpp
@@ -20,7 +20,7 @@
#include "ingen/Log.hpp"
#include "ingen/Module.hpp"
#include "ingen/World.hpp"
-#include "ingen/types.hpp"
+#include "ingen/memory.hpp"
namespace ingen { namespace server { class Driver; } }