Move remaining private bits into the private header

Signed-off-by: Petr Štetiar <ynezz@true.cz>