Fix typedef and include guard in clustering and  cluster_analysis
Merge pull request #522 from hido/fix_cluster_type_and_include_guard

Fix typedef and include guard in clustering and cluster_analysis