Fixed leftover merge code.
Fixed included extensions.
Fixed included extensions.
Fixed included extensions.