diff --git a/src/cpim/parser/cpim-parser.cpp b/src/cpim/parser/cpim-parser.cpp
index c57a15ab2..724f4bf68 100644
--- a/src/cpim/parser/cpim-parser.cpp
+++ b/src/cpim/parser/cpim-parser.cpp
@@ -279,7 +279,7 @@ shared_ptr<Cpim::Header> Cpim::Parser::cloneHeader (const Header &header) {
 
 class EmptyObject {};
 
-inline bool headerIsValid (const shared_ptr<belr::Grammar> &grammar, const string &input) {
+static bool headerIsValid (const shared_ptr<belr::Grammar> &grammar, const string &input) {
 	belr::Parser<shared_ptr<EmptyObject> > parser(grammar);
 	parser.setHandler(
 		"Header", belr::make_fn(make_shared<EmptyObject> )
@@ -307,7 +307,7 @@ bool Cpim::Parser::headerParameterIsValid (const string &headerParameter) const
 
 // -----------------------------------------------------------------------------
 
-inline bool coreHeaderIsValid (
+static bool coreHeaderIsValid (
 	const shared_ptr<belr::Grammar> &grammar,
 	const string &headerName,
 	const string &headerValue,
diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp
index e6f7ef56e..2b04961c2 100644
--- a/src/db/events-db.cpp
+++ b/src/db/events-db.cpp
@@ -48,21 +48,21 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {}
 // Helpers.
 // -----------------------------------------------------------------------------
 
-constexpr pair<EventsDb::Filter, const char *> eventFilterToSql[]{
+static constexpr pair<EventsDb::Filter, const char *> eventFilterToSql[] = {
 	{ EventsDb::MessageFilter, "1" },
 	{ EventsDb::CallFilter, "2" },
 	{ EventsDb::ConferenceFilter, "3" }
 };
 
-constexpr const char *mapEventFilterToSql (EventsDb::Filter filter) {
+static constexpr const char *mapEventFilterToSql (EventsDb::Filter filter) {
 	return eventFilterToSql[filter].second;
 }
 
-constexpr const char *mapMessageDirectionToSql (Message::Direction direction) {
+static constexpr const char *mapMessageDirectionToSql (Message::Direction direction) {
 	return direction == Message::Direction::Incoming ? "1" : "2";
 }
 
-constexpr pair<Message::State, const char *> messageStateToSql[]{
+static constexpr pair<Message::State, const char *> messageStateToSql[] = {
 	{ Message::Idle, "1" },
 	{ Message::InProgress, "2" },
 	{ Message::Delivered, "3" },
@@ -73,7 +73,7 @@ constexpr pair<Message::State, const char *> messageStateToSql[]{
 	{ Message::Displayed, "8" }
 };
 
-constexpr const char *mapMessageStateToSql (Message::State state) {
+static constexpr const char *mapMessageStateToSql (Message::State state) {
 	return messageStateToSql[state].second;
 }