I'd also argue that some services provided by the gov't help towards GDP. An example being the Consumer Financial Protection Bureau and them helping to recoup funds from scams and returning the money to victims who would then spend their money and increase the "Consumption" in GDP.
I was just editing my comment to say the same, yeah.