diff --git a/app-mgmt-test/port-start-srv/main.c b/app-mgmt-test/port-start-srv/main.c
index 8411560..aa816d2 100644
--- a/app-mgmt-test/port-start-srv/main.c
+++ b/app-mgmt-test/port-start-srv/main.c
@@ -91,7 +91,7 @@
     port = (handle_t)rc;
 
     uevt.handle = port;
-    uevt.event = ~0;
+    uevt.event = ~0U;
     uevt.cookie = NULL;
 
     rc = handle_set_ctrl(hset, HSET_ADD, &uevt);
@@ -166,7 +166,7 @@
     channel = (handle_t)rc;
 
     uevt.handle = channel;
-    uevt.event = ~0;
+    uevt.event = ~0U;
     uevt.cookie = NULL;
 
     rc = handle_set_ctrl(mixed_hset, HSET_ADD, &uevt);
diff --git a/ipc-unittest/main/main.c b/ipc-unittest/main/main.c
index 5b16ab8..74a2e60 100644
--- a/ipc-unittest/main/main.c
+++ b/ipc-unittest/main/main.c
@@ -1407,7 +1407,7 @@
 
     uevent_t evt = {
             .handle = hset2,
-            .event = ~0,
+            .event = ~0U,
             .cookie = NULL,
     };
 
@@ -1439,7 +1439,7 @@
 
     uevent_t evt = {
             .handle = hset1,
-            .event = ~0,
+            .event = ~0U,
             .cookie = NULL,
     };
 
@@ -1470,7 +1470,7 @@
 
     uevent_t evt = {
             .handle = hset2,
-            .event = ~0,
+            .event = ~0U,
             .cookie = NULL,
     };
 
@@ -1509,7 +1509,7 @@
 
     uevent_t evt = {
             .handle = hset2,
-            .event = ~0,
+            .event = ~0U,
             .cookie = NULL,
     };
 
@@ -1564,7 +1564,7 @@
 
     uevent_t evt = {
             .handle = hset2,
-            .event = ~0,
+            .event = ~0U,
             .cookie = NULL,
     };
 
@@ -1642,35 +1642,35 @@
 
     /* chan1 to hset2 */
     evt.handle = chan1;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie12;
     rc = handle_set_ctrl(hset2, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add hset2 to hset1");
 
     /* chan2 to hset2 */
     evt.handle = chan2;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie22;
     rc = handle_set_ctrl(hset2, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add hset2 to hset1");
 
     /* add hset2 to hset1 */
     evt.handle = hset2;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookiehs2;
     rc = handle_set_ctrl(hset1, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add hset2 to hset1");
 
     /* chan1 to hset1 */
     evt.handle = chan1;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie11;
     rc = handle_set_ctrl(hset1, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add hset2 to hset1");
 
     /* chan2 to hset1 */
     evt.handle = chan2;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie21;
     rc = handle_set_ctrl(hset1, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add hset2 to hset1");
@@ -1774,7 +1774,7 @@
 
     /* chan1 to hset1 */
     evt.handle = chan1;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie11;
     rc = handle_set_ctrl(hset1, HSET_ADD, &evt);
     EXPECT_EQ(0, rc, "add chan1 to hset1");
@@ -1804,7 +1804,7 @@
 
     /* unmask off chan1 in hset1 */
     evt.handle = chan1;
-    evt.event = ~0;
+    evt.event = ~0U;
     evt.cookie = cookie11;
     rc = handle_set_ctrl(hset1, HSET_MOD, &evt);
     EXPECT_EQ(0, rc, "mod chan1 in hset1");