[Matahari] [PATCH] Remove unused includes to avoid linking to libqpidcommon