Makefiles changed and missing include added