Fixed some includes which may cause problem in the future.
Small and somehow inconsequent changes.