Fix includes for various modules

These commits fix includes in various modules. This way, these modules at least compile. This doesn't necessarily mean they actually work, but at least they can be tested by those interested in using the modules.