Some #include fixes; typo fixes.