diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2eb1ea894..40690af42 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -41,7 +41,6 @@ jobs:
     - name: Test
       env:
         CC: ${{ matrix.compiler }}
-        LIBDQLITE_TRACE: 1
         ASAN_OPTIONS: fast_unwind_on_malloc=0
       run: |
           ./test/raft/lib/fs.sh setup
diff --git a/.github/workflows/latest-deps.yml b/.github/workflows/latest-deps.yml
index f54a22a98..9832ad341 100644
--- a/.github/workflows/latest-deps.yml
+++ b/.github/workflows/latest-deps.yml
@@ -58,7 +58,7 @@ jobs:
     - name: Build dqlite
       run: |
           autoreconf -i
-          ./configure --enable-debug --enable-sanitize --enable-build-raft --enable-build-sqlite
+          ./configure CFLAGS="-march=x86-64-v3" --enable-debug --enable-sanitize --enable-build-raft --enable-build-sqlite
           make -j4 unit-test integration-test \
                    raft-core-fuzzy-test \
                    raft-core-integration-test \
@@ -69,5 +69,4 @@ jobs:
 
     - name: Test
       run: |
-           export LIBDQLITE_TRACE=1
            make check || (cat ./test-suite.log && false)
diff --git a/Makefile.am b/Makefile.am
index 8547e38c3..d3cbc173b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,6 @@ libraft_la_SOURCES = \
   src/raft/entry.c \
   src/raft/err.c \
   src/raft/fixture.c \
-  src/raft/flags.c \
   src/raft/heap.c \
   src/raft/log.c \
   src/raft/membership.c \
diff --git a/src/raft/byte.h b/src/raft/byte.h
index ba213e914..a1432d7c0 100644
--- a/src/raft/byte.h
+++ b/src/raft/byte.h
@@ -7,14 +7,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__cplusplus)
-#define BYTE__INLINE inline
-#else
 #if defined(__clang__)
-#define BYTE__INLINE static inline __attribute__((unused))
+# define BYTE__INLINE static inline __attribute__((unused))
 #else
-#define BYTE__INLINE static inline
-#endif
+# define BYTE__INLINE static inline
 #endif
 
 /* Compile-time endianess detection (best effort). */
diff --git a/src/raft/flags.c b/src/raft/flags.c
deleted file mode 100644
index 7247613ab..000000000
--- a/src/raft/flags.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "flags.h"
-
-inline raft_flags flagsSet(raft_flags in, raft_flags flags)
-{
-	return in | flags;
-}
-
-inline raft_flags flagsClear(raft_flags in, raft_flags flags)
-{
-	return in & (~flags);
-}
-
-inline bool flagsIsSet(raft_flags in, raft_flags flag)
-{
-	return (bool)(in & flag);
-}
diff --git a/src/raft/flags.h b/src/raft/flags.h
index 79d2a8428..e9a4aa2a9 100644
--- a/src/raft/flags.h
+++ b/src/raft/flags.h
@@ -7,14 +7,23 @@
 
 /* Adds the flags @flags to @in and returns the new flags. Multiple flags should
  * be combined using the `|` operator. */
-raft_flags flagsSet(raft_flags in, raft_flags flags);
+static inline raft_flags flagsSet(raft_flags in, raft_flags flags)
+{
+	return in | flags;
+}
 
 /* Clears the flags @flags from @in and returns the new flags. Multiple flags
  * should be combined using the `|` operator. */
-raft_flags flagsClear(raft_flags in, raft_flags flags);
+static inline raft_flags flagsClear(raft_flags in, raft_flags flags)
+{
+	return in & (~flags);
+}
 
 /* Returns `true` if the single flag @flag is set in @in, otherwise returns
  * `false`. */
-bool flagsIsSet(raft_flags in, raft_flags flag);
+static inline bool flagsIsSet(raft_flags in, raft_flags flag)
+{
+	return (bool)(in & flag);
+}
 
 #endif /* FLAGS_H */
diff --git a/src/raft/progress.c b/src/raft/progress.c
index 756d1ced2..f7f3c9fc6 100644
--- a/src/raft/progress.c
+++ b/src/raft/progress.c
@@ -176,14 +176,14 @@ void progressMarkRecentRecv(struct raft *r, const unsigned i)
 	r->leader_state.progress[i].recent_recv = true;
 }
 
-inline void progressSetFeatures(struct raft *r,
+void progressSetFeatures(struct raft *r,
 				const unsigned i,
 				raft_flags features)
 {
 	r->leader_state.progress[i].features = features;
 }
 
-inline raft_flags progressGetFeatures(struct raft *r, const unsigned i)
+raft_flags progressGetFeatures(struct raft *r, const unsigned i)
 {
 	return r->leader_state.progress[i].features;
 }
diff --git a/src/raft/replication.c b/src/raft/replication.c
index faec92876..2b04094e8 100644
--- a/src/raft/replication.c
+++ b/src/raft/replication.c
@@ -1983,7 +1983,7 @@ void replicationQuorum(struct raft *r, const raft_index index)
 	return;
 }
 
-inline bool replicationInstallSnapshotBusy(struct raft *r)
+bool replicationInstallSnapshotBusy(struct raft *r)
 {
 	return r->last_stored == 0 && r->snapshot.put.data != NULL;
 }
diff --git a/src/registry.h b/src/registry.h
index 6a1495dbf..1bb4980c8 100644
--- a/src/registry.h
+++ b/src/registry.h
@@ -32,6 +32,6 @@ struct db *registry__get(const struct registry *r, const char *filename);
 /**
  * Returns the number of databases in the registry. 
  */
-inline size_t registry__size(const struct registry *r) { return r->size; }
+static inline size_t registry__size(const struct registry *r) { return r->size; }
 
 #endif /* REGISTRY_H_*/