Fix not using rpi-specialized routines when compiling for rpi
Remove inclusion of typesettings.h (replace with smaller components)