5 files changed, 16 insertions, 12 deletions
diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp
index c7ea48d..2afedbc 100644
--- a/src/engine/Machine.cpp
+++ b/src/engine/Machine.cpp
@@ -49,7 +49,7 @@ Machine::Machine(TimeUnit unit)
  * fresh state (deactivated, rewound)
  */
 Machine::Machine(const Machine& copy)
-	: Raul::Stateful() // don't copy RDF ID
+	: Stateful() // don't copy RDF ID
 	, _active_nodes(MAX_ACTIVE_NODES, SharedPtr<Node>())
 	, _is_activated(false)
 	, _is_finished(false)
diff --git a/src/engine/machina/Action.hpp b/src/engine/machina/Action.hpp
index d9d9d7b..4c251ee 100644
--- a/src/engine/machina/Action.hpp
+++ b/src/engine/machina/Action.hpp
@@ -20,10 +20,12 @@
 
 #include <string>
 #include <iostream>
+
 #include "raul/MIDISink.hpp"
-#include "raul/TimeSlice.hpp"
-#include "raul/Stateful.hpp"
 #include "raul/SharedPtr.hpp"
+#include "raul/TimeSlice.hpp"
+
+#include "Stateful.hpp"
 #include "types.hpp"
 
 namespace Machina {
@@ -31,7 +33,7 @@ namespace Machina {
 
 /** An Action, executed on entering or exiting of a state.
  */
-struct Action : public Raul::Deletable, public Raul::Stateful {
+struct Action : public Raul::Deletable, public Stateful {
 	virtual void execute(SharedPtr<Raul::MIDISink> sink, Raul::TimeStamp time) = 0;
 
 	virtual void write_state(Redland::Model& model);
diff --git a/src/engine/machina/Edge.hpp b/src/engine/machina/Edge.hpp
index 9c45f67..71c113d 100644
--- a/src/engine/machina/Edge.hpp
+++ b/src/engine/machina/Edge.hpp
@@ -20,18 +20,20 @@
 
 #include <list>
 #include <boost/utility.hpp>
-#include "raul/WeakPtr.hpp"
-#include "raul/SharedPtr.hpp"
+
 #include "raul/DoubleBuffer.hpp"
-#include "raul/Stateful.hpp"
-#include "types.hpp"
+#include "raul/SharedPtr.hpp"
+#include "raul/WeakPtr.hpp"
+
 #include "Action.hpp"
+#include "Stateful.hpp"
+#include "types.hpp"
 
 namespace Machina {
 
 class Node;
 
-class Edge : public Raul::Stateful {
+class Edge : public Stateful {
 public:
 
 	Edge(WeakPtr<Node> tail, SharedPtr<Node> head)
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 8c1caf3..f7a6479 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -37,7 +37,7 @@ class LearnRequest;
 
 /** A (Finite State) Machine.
  */
-class Machine : public Raul::Stateful {
+class Machine : public Stateful {
 public:
 	Machine(TimeUnit unit);
 	Machine(const Machine& copy);
diff --git a/src/engine/machina/Node.hpp b/src/engine/machina/Node.hpp
index 730c82b..227e291 100644
--- a/src/engine/machina/Node.hpp
+++ b/src/engine/machina/Node.hpp
@@ -21,10 +21,10 @@
 #include "raul/List.hpp"
 #include "raul/MIDISink.hpp"
 #include "raul/SharedPtr.hpp"
-#include "raul/Stateful.hpp"
 
 #include "Action.hpp"
 #include "Schrodinbit.hpp"
+#include "Stateful.hpp"
 
 namespace Machina {
 
@@ -42,7 +42,7 @@ using Raul::TimeUnit;
  * Initial nodes do not have enter actions (since they are entered at
  * an undefined point in time <= 0).
  */
-class Node : public Raul::Stateful {
+class Node : public Stateful {
 public:
 	typedef std::string ID;