Fixes includes of external libraries
Fixes merging of fix_libraries