Moved mac headers into cbits