A handful of changes after applying pull request #191 from

Alessandro De Laurenzis.  That pull request cleaned up the vast
majority of compiler warnings.  However, that cleanup exposed a
few additional warnings pointing to errors in the code that needed
fixing.  The code now compiles cleanly except for one warning
about redefined CAD_DIR that I have not looked into.

garouter/gaChannel.c

@@ -43,7 +43,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 #include "debug/debug.h"
 
 /* C99 compat */
-#include "gaRouter/gaInternal.h"
+#include "garouter/gaInternal.h"
 
 /* List of all active channels */
 GCRChannel *gaChannelList = NULL;