Fix multiple include blocks