diff --git a/source/libs/sync/inc/syncRequestVote.h b/source/libs/sync/inc/syncRequestVote.h
index c51ea4eea6cc4ace3c3e813c643b881e359fbad3..ae8e3ff1cf78591ab11658fe0d18c968dfa37e1c 100644
--- a/source/libs/sync/inc/syncRequestVote.h
+++ b/source/libs/sync/inc/syncRequestVote.h
@@ -21,7 +21,6 @@ extern "C" {
 #endif
 
 #include "syncInt.h"
-#include "syncMessage.h"
 
 // TLA+ Spec
 // HandleRequestVoteRequest(i, j, m) ==
diff --git a/source/libs/sync/inc/syncRequestVoteReply.h b/source/libs/sync/inc/syncRequestVoteReply.h
index 1adab30aaa5ea1d7a1ccbe0179da8c44d87e3f39..ea43f0301dbe3e0a557e15fca146c116f2240e97 100644
--- a/source/libs/sync/inc/syncRequestVoteReply.h
+++ b/source/libs/sync/inc/syncRequestVoteReply.h
@@ -21,7 +21,6 @@ extern "C" {
 #endif
 
 #include "syncInt.h"
-#include "syncMessage.h"
 
 // TLA+ Spec
 // HandleRequestVoteResponse(i, j, m) ==
diff --git a/source/libs/sync/src/syncRaftStore.c b/source/libs/sync/src/syncRaftStore.c
index dcc4e1f1330a9b8163b338f5d3f0bc0b879fdbf7..1c96e70858f4ad1cdf4b8615748a05a18b51530b 100644
--- a/source/libs/sync/src/syncRaftStore.c
+++ b/source/libs/sync/src/syncRaftStore.c
@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "syncRaftStore.h"
 #include "cJSON.h"
 #include "syncEnv.h"
diff --git a/source/libs/sync/src/syncReplication.c b/source/libs/sync/src/syncReplication.c
index 3f22a1f2cd046545e66a4d6f67e694fbf739a215..2a3705e139ad7a99cf3d86bda1e95f06de539954 100644
--- a/source/libs/sync/src/syncReplication.c
+++ b/source/libs/sync/src/syncReplication.c
@@ -13,14 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "syncReplication.h"
 #include "syncIndexMgr.h"
-#include "syncMessage.h"
-#include "syncRaftCfg.h"
 #include "syncRaftEntry.h"
-#include "syncRaftLog.h"
 #include "syncRaftStore.h"
-#include "syncSnapshot.h"
 #include "syncUtil.h"
 
 // TLA+ Spec
diff --git a/source/libs/sync/src/syncRequestVote.c b/source/libs/sync/src/syncRequestVote.c
index 7e2587372b9a84e9dd130a12c3bb6817fc84f54b..f2b75def6b58425e68d78a4d1f02cf0b69a887c3 100644
--- a/source/libs/sync/src/syncRequestVote.c
+++ b/source/libs/sync/src/syncRequestVote.c
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "syncRequestVote.h"
-#include "syncInt.h"
 #include "syncRaftCfg.h"
 #include "syncRaftStore.h"
 #include "syncUtil.h"
diff --git a/source/libs/sync/src/syncRequestVoteReply.c b/source/libs/sync/src/syncRequestVoteReply.c
index 44efaa068a19814d4fe73685724051c0b21faa41..02b9bb40acbe2ab8c98a677a1c80c00ab2940b20 100644
--- a/source/libs/sync/src/syncRequestVoteReply.c
+++ b/source/libs/sync/src/syncRequestVoteReply.c
@@ -13,11 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "syncRequestVoteReply.h"
-#include "syncInt.h"
-#include "syncRaftCfg.h"
 #include "syncRaftStore.h"
-#include "syncUtil.h"
 #include "syncVoteMgr.h"
 
 // TLA+ Spec