gsp: comm: Fix compilation errors due to reorganization