more cleanup -- #include fixup