diff --git a/src/object/app-data-container.cpp b/src/object/app-data-container.cpp
index 7d6117bd7..2f26bc886 100644
--- a/src/object/app-data-container.cpp
+++ b/src/object/app-data-container.cpp
@@ -27,6 +27,8 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
+// -----------------------------------------------------------------------------
+
 class AppDataContainerPrivate {
 public:
 	shared_ptr<unordered_map<string, string>> appData;
diff --git a/src/object/base-object-p.h b/src/object/base-object-p.h
index 3db55188e..a46d1f701 100644
--- a/src/object/base-object-p.h
+++ b/src/object/base-object-p.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
- #ifndef _BASE_OBJECT_P_H_
- #define _BASE_OBJECT_P_H_
+#ifndef _BASE_OBJECT_P_H_
+#define _BASE_OBJECT_P_H_
 
 #include "linphone/utils/general.h"
 
diff --git a/src/object/object.cpp b/src/object/object.cpp
index 77e333aa2..2fd8c65cf 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -26,6 +26,8 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
+// -----------------------------------------------------------------------------
+
 Object::Object (ObjectPrivate &p) : BaseObject(p) {}
 
 shared_ptr<Object> Object::getSharedFromThis () {
@@ -39,6 +41,8 @@ shared_ptr<const Object> Object::getSharedFromThis () const {
 		lFatal() << "Object " << this << " was not created with make_shared.";
 	}
 
+	// Unable to reach this point.
+	L_ASSERT(false);
 	return nullptr;
 }
 
diff --git a/src/object/object.h b/src/object/object.h
index e132fc075..fec368cba 100644
--- a/src/object/object.h
+++ b/src/object/object.h
@@ -38,7 +38,6 @@ class LINPHONE_PUBLIC Object :
 	public std::enable_shared_from_this<Object>,
 	public BaseObject,
 	public PropertyContainer {
-	friend class ObjectFactory;
 
 public:
 	std::shared_ptr<Object> getSharedFromThis ();
diff --git a/src/object/property-container.cpp b/src/object/property-container.cpp
index 36cbe6993..c23e628ef 100644
--- a/src/object/property-container.cpp
+++ b/src/object/property-container.cpp
@@ -27,6 +27,8 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
+// -----------------------------------------------------------------------------
+
 class PropertyContainerPrivate {
 public:
 	unordered_map<string, Variant> properties;
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 8d4f55efe..e3819de39 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -31,6 +31,8 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
+// -----------------------------------------------------------------------------
+
 bool Utils::iequals (const string &a, const string &b) {
 	size_t size = a.size();
 	if (b.size() != size)
diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp
index 45aea40bc..ca8b4b746 100644
--- a/src/variant/variant.cpp
+++ b/src/variant/variant.cpp
@@ -27,6 +27,8 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
+// -----------------------------------------------------------------------------
+
 class VariantPrivate {
 public:
 	union Value {