diff --git a/src/runtime/encore/encore.c b/src/runtime/encore/encore.c
index 145b944ef..a04cb0460 100644
--- a/src/runtime/encore/encore.c
+++ b/src/runtime/encore/encore.c
@@ -1,11 +1,12 @@
 #include <pony/pony.h>
+#include "encore.h"
 
 /// The starting point of all Encore programs
 int encore_start(int argc, char** argv, encore_actor_t *type)
 {
   argc = pony_init(argc, argv);
   pony_actor_t* actor = pony_create(type);
-  pony_sendargs(actor, MSG_ARGS, argc, argv);
+  pony_sendargs(actor, _ENC__MSG_MAIN, argc, argv);
 
   return pony_start(PONY_DONT_WAIT);
 }
diff --git a/src/runtime/encore/encore.h b/src/runtime/encore/encore.h
index 148882525..2eb81c942 100644
--- a/src/runtime/encore/encore.h
+++ b/src/runtime/encore/encore.h
@@ -9,6 +9,14 @@ typedef enum {
   CLOSURE_ID = 0
 } encore_type_id;
 
+typedef enum {
+  _ENC__MSG_RESUME_GET,
+  _ENC__MSG_RESUME_SUSPEND,
+  _ENC__MSG_RESUME_AWAIT,
+  _ENC__MSG_RUN_CLOSURE,
+  _ENC__MSG_MAIN,
+} encore_msg_id;
+
 typedef struct encore_actor encore_actor_t;
 
 struct encore_actor