diff --git a/smocore/component.cpp b/smocore/component.cpp
index dc94241..cbe9315 100644
--- a/smocore/component.cpp
+++ b/smocore/component.cpp
@@ -1,4 +1,5 @@
 #include <component.h>
+#include <marionette/marionette.h>
 
 namespace smo {
 
diff --git a/smocore/include/component.h b/smocore/include/component.h
index 85ecb4e..dac1094 100644
--- a/smocore/include/component.h
+++ b/smocore/include/component.h
@@ -34,26 +34,6 @@ public:
 	Mind &parent;
 };
 
-namespace mrntt {
-
-class MarionetteComponent
-:	public Component
-{
-public:
-	MarionetteComponent(const std::shared_ptr<ComponentThread> &thread);
-	~MarionetteComponent() = default;
-
-public:
-	typedef std::function<void(bool)> mrnttLifetimeMgmtOpCbFn;
-	void initializeReq(Callback<mrnttLifetimeMgmtOpCbFn> callback);
-	void finalizeReq(Callback<mrnttLifetimeMgmtOpCbFn> callback);
-
-private:
-	class MrnttLifetimeMgmtOp;
-};
-
-} // namespace mrntt
-
 } // namespace smo
 
 #endif // COMPONENT_H
diff --git a/smocore/include/marionette/marionette.h b/smocore/include/marionette/marionette.h
index fb716d7..2468d09 100644
--- a/smocore/include/marionette/marionette.h
+++ b/smocore/include/marionette/marionette.h
@@ -12,6 +12,26 @@ class MarionetteThread;
 
 namespace mrntt {
 
+class MarionetteComponent
+:	public Component
+{
+public:
+	MarionetteComponent(const std::shared_ptr<ComponentThread> &thread);
+	~MarionetteComponent() = default;
+
+public:
+	typedef std::function<void(bool)> mrnttLifetimeMgmtOpCbFn;
+	void initializeReq(Callback<mrnttLifetimeMgmtOpCbFn> callback);
+	void finalizeReq(Callback<mrnttLifetimeMgmtOpCbFn> callback);
+
+	void intrinEventInd(void);
+	void negtrinEventInd(void);
+	void postrinEventInd(void);
+
+private:
+	class MrnttLifetimeMgmtOp;
+};
+
 extern std::atomic<int> exitCode;
 void exitMarionetteLoop();
 void marionetteFinalizeReqCb(bool success);