diff --git a/companion/src/modeledit/mixerslist.cpp b/companion/src/modeledit/mixerslist.cpp
index 879383075..3d5e3e3e7 100644
--- a/companion/src/modeledit/mixerslist.cpp
+++ b/companion/src/modeledit/mixerslist.cpp
@@ -75,7 +75,7 @@ bool MixersList::dropMimeData( int index, const QMimeData * data, Qt::DropAction
 */
 void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    QStyleOptionViewItemV4 options = option;
+    QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
     painter->save();
@@ -107,7 +107,7 @@ void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option
 */
 QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
-    QStyleOptionViewItemV4 options = option;
+    QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
     //setup html document
@@ -125,7 +125,7 @@ QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QMod
     return QSize(doc.idealWidth(), height);
 }
 
-void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const
+void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const
 {
     //setup html document
     doc.setHtml(options.text);
diff --git a/companion/src/modeledit/mixerslist.h b/companion/src/modeledit/mixerslist.h
index 0dda2a5ca..0a4c990b5 100644
--- a/companion/src/modeledit/mixerslist.h
+++ b/companion/src/modeledit/mixerslist.h
@@ -46,7 +46,7 @@ class MixersDelegate : public QStyledItemDelegate
     QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 
   private:
-    void SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const;
+    void SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const;
 
 };
 
diff --git a/companion/src/mountlist.cpp b/companion/src/mountlist.cpp
index e041a5fe0..7855eab11 100644
--- a/companion/src/mountlist.cpp
+++ b/companion/src/mountlist.cpp
@@ -210,7 +210,7 @@
 #ifdef MOUNTED_GETMNTINFO
 
 # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
-static char *
+static const char *
 fstype_to_string (short int t)
 {
   switch (t)
@@ -305,7 +305,7 @@ fstype_to_string (short int t)
 }
 # endif
 
-static char *
+static const char *
 fsp_to_string (const struct statfs *fsp)
 {
 # if HAVE_STRUCT_STATFS_F_FSTYPENAME
diff --git a/radio/src/rtc.cpp b/radio/src/rtc.cpp
index d8da110e0..49135c4e2 100644
--- a/radio/src/rtc.cpp
+++ b/radio/src/rtc.cpp
@@ -78,18 +78,17 @@ extern void rtcdriver_settime(struct gtm * t);
 #endif
 #define TIME_T_MIDPOINT (SHR (TIME_T_MIN + TIME_T_MAX, 1) + 1)
 
-/* Verify a requirement at compile-time (unlike assert, which is runtime).  */
-#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
 
-verify(gtime_t_is_integer, TYPE_IS_INTEGER(gtime_t));
-verify(twos_complement_arithmetic, TYPE_TWOS_COMPLEMENT(int));
+
+static_assert(TYPE_IS_INTEGER(gtime_t), "gtime_t is not integer");
+static_assert(TYPE_TWOS_COMPLEMENT(int), "twos complement arithmetic");
 /* The code also assumes that signed integer overflow silently wraps
    around, but this assumption can't be stated without causing a
    diagnostic on some hosts.  */
 
 #define EPOCH_YEAR 1970
 #define TM_YEAR_BASE 1900
-verify(base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
+static_assert(TM_YEAR_BASE % 100 == 0, "base year is not a multiple of 100");
 
 /* Return 1 if YEAR + TM_YEAR_BASE is a leap year.  */
 static inline int leapyear(long int year)
@@ -188,8 +187,8 @@ struct gtm * __localtime_r(const gtime_t * t, struct gtm * tp)
 static inline gtime_t ydhms_diff(long int year1, long int yday1, int hour1, int min1, int sec1,
                                  int year0, int yday0, int hour0, int min0, int sec0)
 {
-  verify(C99_integer_division, -1 / 2 == 0);
-  verify(long_int_year_and_yday_are_wide_enough, INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
+  static_assert(-1 / 2 == 0, "no C99 integer division");
+  static_assert(INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX, "long int year and yday are not wide enough");
 
   /* Compute intervening leap days correctly even if year is negative.
      Take care to avoid integer overflow here.  */