Fix headers inclusion
Properly do the version switch...