diff -up ./src/freight-agent/freightproxy_main.c.buildfix ./src/freight-agent/freightproxy_main.c
--- ./src/freight-agent/freightproxy_main.c.buildfix	2015-12-21 10:31:38.000000000 -0500
+++ ./src/freight-agent/freightproxy_main.c	2017-01-25 11:22:53.091074521 -0500
@@ -75,10 +75,10 @@ processContentLength(TSession *    const
         RequestHeaderValue(httpRequestP, "content-length");
 
     if (content_length == NULL) {
-        *missingP = TRUE;
+        *missingP = true;
         *errorP = NULL;
     } else {
-        *missingP = FALSE;
+        *missingP = false;
         *inputLenP = 0;  /* quiet compiler warning */
         if (content_length[0] == '\0')
             asprintf((char **)errorP, "The value in your content-length "
@@ -190,8 +190,8 @@ GetToken(char ** const pP) {
 		switch (**pP) {
 	case '\t':
 	case ' ':
-	case CR:
-	case LF:
+	case '\r':
+	case '\n':
 	case '\0':
 		if (p0 == *pP)
 			return NULL;
@@ -323,15 +323,15 @@ RequestAuthFromDb(TSession *   const ses
 				if (dbpass && !strcmp(dbpass, pass)) {
 					SessionGetRequestInfo(sessionP, (const TRequestInfo ** const)&requestP);
 					requestP->user = strdup(user);
-					authorized = TRUE;
+					authorized = true;
 				} else
-					authorized = FALSE;
+					authorized = false;
 			} else
-				authorized = FALSE;
+				authorized = false;
 		} else
-			authorized = FALSE;
+			authorized = false;
 	} else
-		authorized = FALSE;
+		authorized = false;
 
 	if (!authorized) {
 		char hdrValue[1024];
@@ -368,7 +368,7 @@ static abyss_bool handleDefaultRequest(T
 {
 	ResponseStatus(sessionP, 500); /* Not found */
 	ResponseError2(sessionP, "We don't serve regular html in these here parts");
-	return TRUE;
+	return true;
 }
 
 static void handleFreightRPC(void * const handler,
@@ -381,7 +381,7 @@ static void handleFreightRPC(void * cons
 	struct call_info cinfo;
 	xmlrpc_mem_block *body;
 
-	*handledP = TRUE;
+	*handledP = true;
 
 	authenticated = RequestAuthFromDb(sessionP, "FreightProxyDomain");
 
diff -up ./src/freight-agent/xmlrpc_client.c.buildfix ./src/freight-agent/xmlrpc_client.c
--- ./src/freight-agent/xmlrpc_client.c.buildfix	2015-12-21 10:31:38.000000000 -0500
+++ ./src/freight-agent/xmlrpc_client.c	2017-01-25 11:22:16.135147238 -0500
@@ -32,7 +32,7 @@ struct xmlrpc_info {
 	xmlrpc_server_info *server;
 };
 
-static int xmlrpc_init(struct agent_config *acfg)
+static int xmlrpc_init_driver(struct agent_config *acfg)
 {
 	struct xmlrpc_info *info;
 	char *port = "80";
@@ -685,7 +685,7 @@ static int xmlrpc_send_raw_sql(const cha
 }
 
 struct db_api xmlrpc_api = {
-	.init = xmlrpc_init,
+	.init = xmlrpc_init_driver,
 	.cleanup = xmlrpc_cleanup,
 	.connect = xmlrpc_connect,
 	.disconnect = xmlrpc_disconnect,