Dear C::B users/devs

First i must say that i'm very impressed with Code::Blocks. I started using C::B for wxWidgets developement, but switched to wxDev-Cpp. But wxDev-Cpp crashed about 20 times per hour, so i went to the C::B nightly builds forum and downloaded the lastest nightly build with new Dll's and so on. WHOOAA it's nice

! Very nice "new project guide" and user interface. And wxSmith is incredibly well made compared to wxDev-Cpp's.
I'm working on a chat app (see
http://wxforum.shadonet.com/viewtopic.php?p=72278), and decided to post this problem in a second post.
I've decided to code the IM part of the app as a class library, which contains the imCtrl class.
But i have to #include it both from chatApp.h and chatMain.h, and when compiling it compiles fine, and despite my inclusion guards it comes up with 24 linker errors ala "Multiple definition of blabla".
By searching various forums it appears that the problem is that chatApp and ChatMain are two different files, they are not #included from a base file or from one another.
So what do you recommend me to do to fix this problem?
PS: If i have a project consisting of the standard header, cpp and rc files, and i want to merge everything exept the .rc into one .cpp file, is it then enough to edit the .cbp file?