Revert "-changed modules in header files for regular imports"

This reverts commit 4dcb3b218237bb95747b6b595c8775622e64fb7a.