Moved thrift service header import into header