This reverts commit 1a4315f2, reversing changes made to 869401ce. At least one distro (Arch) ships gsm.h inside the gsm/ folder