More G_BEGIN_DECLS/G_END_DECLS.
Remove some redundant includes..