Refactoring: using <#include> directive

Change-Id: I31071b9b526549c8e54e9ca7df8f12f8add00da1