Added more config
Removed uint from types.hpp
Fixed #include's in *.cpp's