added mysql_service; fixes to includes