diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index 2ed94b5c3d..d61006800d 100644
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -28,6 +28,9 @@
  *
  * Version Info: $Id$
  */
+
+#include "asterisk.h"
+
 #include <arpa/inet.h>
 
 #include <list>
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 0acc834368..1b70c15ef9 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -481,7 +481,7 @@ char *ast_str_truncate(struct ast_str *buf, ssize_t len),
 {
 #ifdef DEBUG_OPAQUE
 	if (len < 0) {
-		buf->used2 += (ssize_t) abs(len) > buf->used2 ? -buf->used2 : len;
+		buf->used2 += ((ssize_t) abs(len)) > buf->used2 ? -buf->used2 : len;
 	} else {
 		buf->used2 = len;
 	}
@@ -489,7 +489,7 @@ char *ast_str_truncate(struct ast_str *buf, ssize_t len),
 	return buf->str2;
 #else
 	if (len < 0) {
-		buf->used += (ssize_t) abs(len) > buf->used ? -buf->used : len;
+		buf->used += ((ssize_t) abs(len)) > buf->used ? -buf->used : len;
 	} else {
 		buf->used = len;
 	}