src: rework includes as per cppclean#7563

catenacyber wants to merge 2 commits intoOISF:masterOISF/suricata:masterfrom

catenacyber:include-lesscatenacyber/suricata:include-lessCopy head branch name to clipboard