Fix typedef and include guard in clustering and  cluster_analysis