Dev compile fixes v1.3

- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/139
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/59