Systematic treatment of correlations in a generalized Hartree-Fock approximation