diff --git a/palm/pnostate.h b/palm/pnostate.h
index 5ab356ff1..e7e43e219 100644
--- a/palm/pnostate.h
+++ b/palm/pnostate.h
@@ -4,6 +4,7 @@
 #define _PNOSTATE_H_
 
 #include <PceNativeCall.h>
+#include <MemoryMgr.h>
 
 /* This gets written into the code by the callback below. */
 typedef struct PNOState {
@@ -12,16 +13,21 @@ typedef struct PNOState {
     void* gotTable;
 } PNOState;
 
-typedef struct PnoletUserData PnoletUserData;
-typedef void StorageCallback(PnoletUserData* dataP);
+/* I can't get the circular decls to work now */
+typedef void StorageCallback(/*PnoletUserData*/void* dataP);
 
 /* This is how armlet and 68K stub communicate on startup */
-struct PnoletUserData {
+typedef struct PnoletUserData {
     unsigned long* pnoletEntry;
     unsigned long* gotTable;
     StorageCallback* storageCallback; /* armlet calls this */
     PNOState* stateSrc;           /* armlet fills in */
     PNOState* stateDest;          /* armlet fills in */
-};
+
+    /* PilotMain params */
+    MemPtr cmdPBP;
+    UInt16 cmd; 
+    UInt16 launchFlags;
+} PnoletUserData;
 
 #endif