Fixed problems with include files