diff --git a/include/wsrep/compiler.hpp b/include/wsrep/compiler.hpp
index cbceaba..e1241cb 100644
--- a/include/wsrep/compiler.hpp
+++ b/include/wsrep/compiler.hpp
@@ -31,8 +31,6 @@
 #define WSREP_UNUSED __attribute__((unused))
 #if __cplusplus >= 201103L
 #define WSREP_OVERRIDE override
-#define WSREP_CONSTEXPR_OR_INLINE constexpr
 #else
 #define WSREP_OVERRIDE
-#define WSREP_CONSTEXPR_OR_INLINE inline
 #endif // __cplusplus >= 201103L
diff --git a/include/wsrep/provider.hpp b/include/wsrep/provider.hpp
index a3e7773..24572f9 100644
--- a/include/wsrep/provider.hpp
+++ b/include/wsrep/provider.hpp
@@ -34,6 +34,12 @@
 #include <vector>
 #include <ostream>
 
+/**
+ * Empty provider magic. If none provider is passed to make_provider(),
+ * a dummy provider is loaded.
+ */
+#define WSREP_LIB_PROVIDER_NONE "none"
+
 namespace wsrep
 {
     class server_state;
@@ -405,14 +411,6 @@ namespace wsrep
          */
         virtual void* native() const = 0;
 
-
-        /**
-         * Empty provider magic. If none provider is passed to make_provider(),
-         * a dummy provider is loaded.
-         */
-        static WSREP_CONSTEXPR_OR_INLINE
-        const char* none() { return "none"; }
-
         /**
          * Create a new provider.
          *
diff --git a/include/wsrep/server_state.hpp b/include/wsrep/server_state.hpp
index 7a93901..110f13a 100644
--- a/include/wsrep/server_state.hpp
+++ b/include/wsrep/server_state.hpp
@@ -95,6 +95,13 @@
 #include <string>
 #include <map>
 
+/**
+ * Magic string to tell provider to engage into trivial (empty)
+ * state transfer. No data will be passed, but the node shall be
+ * considered joined.
+ */
+#define WSREP_LIB_SST_TRIVIAL "trivial"
+
 namespace wsrep
 {
     // Forward declarations
@@ -179,14 +186,6 @@ namespace wsrep
             rm_sync
         };
 
-        /**
-         * Magic string to tell provider to engage into trivial (empty)
-         * state transfer. No data will be passed, but the node shall be
-         * considered joined.
-         */
-        static WSREP_CONSTEXPR_OR_INLINE
-        const char* sst_trivial() { return "trivial"; };
-
         virtual ~server_state();
 
         wsrep::encryption_service* encryption_service()