dtool: Undo a few changes to dtoolbase that aren't strictly necessary, to better parallel upstream.
include: Fix a couple more missing includes...
ode: Remove erroneous INLINE declarations.