--- a/Applications/Samples/SimpleViewer/SimpleViewerApplication.h	Mon May 20 15:44:01 2019 +0200
+++ b/Applications/Samples/SimpleViewer/SimpleViewerApplication.h	Mon May 20 16:26:34 2019 +0200
@@ -51,7 +51,6 @@
 #include "ThumbnailInteractor.h"
 #include "MainWidgetInteractor.h"
 #include "AppStatus.h"
-#include "Messages.h"
 
 using namespace OrthancStone;
 
@@ -67,13 +66,14 @@
   {
   public:
 
-    struct StatusUpdatedMessage : public BaseMessage<SimpleViewerMessageType_AppStatusUpdated>
+    struct StatusUpdatedMessage : public IMessage
     {
+      ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
+
       const AppStatus& status_;
 
       StatusUpdatedMessage(const AppStatus& status)
-        : BaseMessage(),
-          status_(status)
+        : status_(status)
       {
       }
     };