include fixes + remove font from samples