Add widgets to makefile and includes