Changed header import statements to support direct source linking.