Include fixes from kpoxapy