Fix a few bugs till Eclipse broke the includes.