-#include <pv/prop/binding/deviceoptions.hpp>
-#include <pv/sigsession.hpp>
-#include <pv/view/signal.hpp>
+#include <pv/binding/device.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/devices/device.hpp>
+#include <pv/session.hpp>
+#include <pv/views/trace/signal.hpp>