diff --git a/serializer/src/agenttypesystem.c b/serializer/src/agenttypesystem.c
index d6d55205e..47f7f2020 100644
--- a/serializer/src/agenttypesystem.c
+++ b/serializer/src/agenttypesystem.c
@@ -3,7 +3,6 @@
 
 #include <stdlib.h>
 #include "azure_c_shared_utility/gballoc.h"
-#include "azure_c_shared_utility/safe_math.h"
 
 #include "agenttypesystem.h"
 #include <inttypes.h>
@@ -30,6 +29,7 @@
 #include "multitree.h"
 
 #include "azure_c_shared_utility/xlogging.h"
+#include "azure_c_shared_utility/safe_math.h"
 
 #define NaN_STRING "NaN"
 #define MINUSINF_STRING "-INF"
diff --git a/uamqp b/uamqp
index 9107c28df..997e40ec9 160000
--- a/uamqp
+++ b/uamqp
@@ -1 +1 @@
-Subproject commit 9107c28dfd790479898f0b018742ccf078ec9ffc
+Subproject commit 997e40ec9b8f9176319e0aee9c971f4590c32f74