Suggestion: Move your business logic into .c files. Headers is there for other reasons.

Take a look at, http://embeddedgurus.com/barr-code/2010/11/what-belongs-in-a...