Made Eclipse happy.

Moved some #include-s and added a #include.