Debug: Fix preprocessor checking for the repeating `#include` directives
Minor fixes in the `#include` directives in headers for packaging