3 files changed, 9 insertions, 9 deletions
diff --git a/include/libms/commonlib.h b/include/libms/commonlib.h
index 13e8bcc1..7a0680e4 100644
--- a/include/libms/commonlib.h
+++ b/include/libms/commonlib.h
@@ -22,8 +22,7 @@ struct MsbBlock {
     /* 0x0C */ u16 field_0x0C;
 };
 
-#pragma push
-#pragma pack(2)
+#pragma pack(push ,2)
 
 struct MsbHeader {
     /* 0x00 */ unsigned char field_0x00[0x0C - 0x00];
@@ -33,7 +32,7 @@ struct MsbHeader {
     /* 0x12 */ int fileLength;
 };
 
-#pragma pop
+#pragma pack(pop)
 
 struct MsbInfo {
     /* 0x00 */ struct MsbHeader *header;
diff --git a/include/libms/flowfile.h b/include/libms/flowfile.h
index 9bc47790..edd1710f 100644
--- a/include/libms/flowfile.h
+++ b/include/libms/flowfile.h
@@ -12,7 +12,7 @@ struct MsbfInfo;
 struct MsbFlowInfo {
     /* 0x00 */ char type;
     /* 0x01 */ char subType;
-    /* 0x04 */ short params1n2;
+    /* 0x04 */ int params1n2;
     /* 0x08 */ short next;
     /* 0x0A */ short param3;
     /* 0x0C */ short param4;
diff --git a/include/libms/msgfile.h b/include/libms/msgfile.h
index 50121699..bc6f2aaa 100644
--- a/include/libms/msgfile.h
+++ b/include/libms/msgfile.h
@@ -2,6 +2,7 @@
 #define LIBMS_MSGFILE_H
 
 #include "common.h"
+#include <wchar.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,11 +17,11 @@ struct MsbtAttrInfo {
 
 struct MsbtInfo *LMS_InitMessage(void *data);
 void LMS_CloseMessage(struct MsbtInfo *info);
-int LMS_GetTextIndexByLabel(struct MsbtInfo *info, const char *label);
-const char *LMS_GetText(struct MsbtInfo *info, int index);
-const char *LMS_GetTextByLabel(struct MsbtInfo *info, const char *label);
-const char *LMS_GetLabelByTextIndex(struct MsbtInfo *info, int index);
-struct MsbtAttrInfo *LMS_GetAttribute(struct MsbtInfo *info, int index);
+int LMS_GetTextIndexByLabel(const struct MsbtInfo *info, const char *label);
+const wchar_t *LMS_GetText(const struct MsbtInfo *info, int index);
+const wchar_t *LMS_GetTextByLabel(const struct MsbtInfo *info, const char *label);
+const char *LMS_GetLabelByTextIndex(const struct MsbtInfo *info, int index);
+struct MsbtAttrInfo *LMS_GetAttribute(const struct MsbtInfo *info, int index);
 
 #ifdef __cplusplus
 }