Fix IncludeFixer to comply with the documentation and make it more robust

                         
|Q            |A        |
|---          |---      |
|Bug Fix?     |yes      |
|New Feature? |n        |
|BC Breaks?   |n        |
|Deprecations?|n        |
|Tests Pass?  |yes      |
|Fixed Tickets|#204 #141|
|License      |MIT      |
|Doc PR       |         |
                         


 Sent using [Gush](https://github.com/gushphp/gush)