diff --git a/libtransmission/net.cc b/libtransmission/net.cc
index 73936fc07..78f33e787 100644
--- a/libtransmission/net.cc
+++ b/libtransmission/net.cc
@@ -37,10 +37,6 @@
 
 using namespace std::literals;
 
-#ifndef IN_MULTICAST
-#define IN_MULTICAST(a) (((a)&0xf0000000) == 0xe0000000)
-#endif
-
 std::string tr_net_strerror(int err)
 {
 #ifdef _WIN32
diff --git a/macosx/FilterBarController.h b/macosx/FilterBarController.h
index 0674b0196..9e1a9211b 100644
--- a/macosx/FilterBarController.h
+++ b/macosx/FilterBarController.h
@@ -18,7 +18,7 @@ typedef NSString* FilterSearchType NS_TYPED_EXTENSIBLE_ENUM;
 extern FilterSearchType const FilterSearchTypeName;
 extern FilterSearchType const FilterSearchTypeTracker;
 
-extern const NSInteger kGroupFilterAllTag;
+extern NSInteger const kGroupFilterAllTag;
 
 @interface FilterBarController : NSViewController
 
diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
index 1bcd40c16..32b0f27af 100644
--- a/macosx/TorrentTableView.h
+++ b/macosx/TorrentTableView.h
@@ -6,7 +6,7 @@
 
 @class Torrent;
 
-extern const CGFloat kGroupSeparatorHeight;
+extern CGFloat const kGroupSeparatorHeight;
 
 @interface TorrentTableView : NSOutlineView<NSOutlineViewDelegate, NSAnimationDelegate, NSPopoverDelegate>
 
diff --git a/qt/DetailsDialog.cc b/qt/DetailsDialog.cc
index 42881be1f..58c8d90f4 100644
--- a/qt/DetailsDialog.cc
+++ b/qt/DetailsDialog.cc
@@ -99,7 +99,7 @@ namespace
 int constexpr DebounceIntervalMSec = 100;
 int constexpr RefreshIntervalMSec = 4000;
 
-char const constexpr* const PrefKey = "pref_key";
+char constexpr const* const PrefKey = "pref_key";
 
 enum // peer columns
 {
diff --git a/qt/PrefsDialog.cc b/qt/PrefsDialog.cc
index 3db0c2897..fa8026ca8 100644
--- a/qt/PrefsDialog.cc
+++ b/qt/PrefsDialog.cc
@@ -259,7 +259,7 @@ void PrefsDialog::focusChanged(QWidget* old, QWidget* cur)
     // We don't want to change the preference every time there's a keystroke
     // in a QPlainTextEdit, so instead of connecting to the textChanged signal,
     // only update the pref when the text changed AND focus was lost.
-    char const constexpr* const StartValue = "StartValue";
+    char constexpr const* const StartValue = "StartValue";
 
     if (auto* const edit = qobject_cast<QPlainTextEdit*>(cur); isDescendantOf(edit, this))
     {
diff --git a/qt/RpcClient.cc b/qt/RpcClient.cc
index c92f92eef..1b35db362 100644
--- a/qt/RpcClient.cc
+++ b/qt/RpcClient.cc
@@ -29,8 +29,8 @@ using ::trqt::variant_helpers::variantInit;
 namespace
 {
 
-char const constexpr* const RequestDataPropertyKey{ "requestData" };
-char const constexpr* const RequestFutureinterfacePropertyKey{ "requestReplyFutureInterface" };
+char constexpr const* const RequestDataPropertyKey{ "requestData" };
+char constexpr const* const RequestFutureinterfacePropertyKey{ "requestReplyFutureInterface" };
 
 TrVariantPtr createVariant()
 {
diff --git a/tests/libtransmission/blocklist-test.cc b/tests/libtransmission/blocklist-test.cc
index e1beae379..f180ea9af 100644
--- a/tests/libtransmission/blocklist-test.cc
+++ b/tests/libtransmission/blocklist-test.cc
@@ -21,7 +21,7 @@ namespace libtransmission::test
 class BlocklistTest : public SessionTest
 {
 protected:
-    static char const constexpr* const Contents1 =
+    static char constexpr const* const Contents1 =
         "10.5.6.7/8\n"
         "Austin Law Firm:216.16.1.144-216.16.1.151\n"
         "Sargent Controls and Aerospace:216.19.18.0-216.19.18.255\n"
@@ -29,7 +29,7 @@ protected:
         "Fox Speed Channel:216.79.131.192-216.79.131.223\n"
         "IPv6 example:2001:db8::-2001:db8:ffff:ffff:ffff:ffff:ffff:ffff\n";
 
-    static char const constexpr* const Contents2 =
+    static char constexpr const* const Contents2 =
         "10.5.6.7/8\n"
         "Austin Law Firm:216.16.1.144-216.16.1.151\n"
         "Sargent Controls and Aerospace:216.19.18.0-216.19.18.255\n"
diff --git a/tests/libtransmission/test-fixtures.h b/tests/libtransmission/test-fixtures.h
index d81314740..c8e0a3d79 100644
--- a/tests/libtransmission/test-fixtures.h
+++ b/tests/libtransmission/test-fixtures.h
@@ -313,22 +313,22 @@ private:
 inline void ensureFormattersInited()
 {
     static constexpr int MEM_K = 1024;
-    static char const constexpr* const MEM_K_STR = "KiB";
-    static char const constexpr* const MEM_M_STR = "MiB";
-    static char const constexpr* const MEM_G_STR = "GiB";
-    static char const constexpr* const MEM_T_STR = "TiB";
+    static char constexpr const* const MEM_K_STR = "KiB";
+    static char constexpr const* const MEM_M_STR = "MiB";
+    static char constexpr const* const MEM_G_STR = "GiB";
+    static char constexpr const* const MEM_T_STR = "TiB";
 
     static constexpr int DISK_K = 1000;
-    static char const constexpr* const DISK_K_STR = "kB";
-    static char const constexpr* const DISK_M_STR = "MB";
-    static char const constexpr* const DISK_G_STR = "GB";
-    static char const constexpr* const DISK_T_STR = "TB";
+    static char constexpr const* const DISK_K_STR = "kB";
+    static char constexpr const* const DISK_M_STR = "MB";
+    static char constexpr const* const DISK_G_STR = "GB";
+    static char constexpr const* const DISK_T_STR = "TB";
 
     static constexpr int SPEED_K = 1000;
-    static char const constexpr* const SPEED_K_STR = "kB/s";
-    static char const constexpr* const SPEED_M_STR = "MB/s";
-    static char const constexpr* const SPEED_G_STR = "GB/s";
-    static char const constexpr* const SPEED_T_STR = "TB/s";
+    static char constexpr const* const SPEED_K_STR = "kB/s";
+    static char constexpr const* const SPEED_M_STR = "MB/s";
+    static char constexpr const* const SPEED_G_STR = "GB/s";
+    static char constexpr const* const SPEED_T_STR = "TB/s";
 
     static std::once_flag flag;