int casts and bad includes

src/key_reset.c

@@ -4,6 +4,8 @@
 #include "pEp_internal.h"
 #include "dynamic_api.h"
 #include "message_api.h"
+#include "key_reset.h"
+
 
 #include <string.h>
 #include <stdlib.h>

src/key_reset.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "key_reset.h"
-
 #include "pEpEngine.h"
 #include "keymanagement.h"
 #include "message.h"

src/keymanagement.c

@@ -1228,8 +1228,8 @@ PEP_STATUS _myself(PEP_SESSION session,
         identity->comm_type = PEP_ct_unknown;
     }
     
-    int major_ver = 0;
-    int minor_ver = 0;
+    unsigned int major_ver = 0;
+    unsigned int minor_ver = 0;
     pEp_version_major_minor(PEP_VERSION, &major_ver, &minor_ver);
     identity->major_ver = major_ver;
     identity->minor_ver = minor_ver;

src/pEpEngine.h

@@ -598,8 +598,8 @@ typedef struct _pEp_identity {
     char lang[3];               // language of conversation
                                 // ISO 639-1 ALPHA-2, last byte is 0
     bool me;                    // if this is the local user herself/himself
-    int major_ver;              // highest version of pEp message received, if any
-    int minor_ver;              // highest version of pEp message received, if any
+    unsigned int major_ver;              // highest version of pEp message received, if any
+    unsigned int minor_ver;              // highest version of pEp message received, if any
     identity_flags_t flags;     // identity_flag1 | identity_flag2 | ...
 } pEp_identity;