Update and rename includedef.h to included.h