Fixed an issue related to static includes