Remove some include extensions
Fix bug in dynamic component detection