diff --git a/src/csync/csync.h b/src/csync/csync.h
index 0c418f9add..8796a9d21c 100644
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -165,7 +165,7 @@ Q_ENUM_NS(ItemType)
 
 using namespace CSyncEnums;
 using CSYNC_STATUS = CSyncEnums::csync_status_codes_e;
-typedef struct csync_file_stat_s csync_file_stat_t;
+using csync_file_stat_t = struct csync_file_stat_s;
 
 struct OCSYNC_EXPORT csync_file_stat_s {
   time_t modtime = 0;
diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp
index 193a9be47c..7542271216 100644
--- a/test/csync/vio_tests/check_vio_ext.cpp
+++ b/test/csync/vio_tests/check_vio_ext.cpp
@@ -44,10 +44,10 @@ int oc_mkdir(const QString &path)
 
 static mbchar_t wd_buffer[WD_BUFFER_SIZE];
 
-typedef struct {
+using statevar = struct {
     QByteArray result;
     QByteArray ignored_dir;
-} statevar;
+};
 
 /* remove the complete test dir */
 static int wipe_testdir()