diff --git a/src/actions/transformations/html_entity_decode.cc b/src/actions/transformations/html_entity_decode.cc
index f77cc1d5..ed119856 100644
--- a/src/actions/transformations/html_entity_decode.cc
+++ b/src/actions/transformations/html_entity_decode.cc
@@ -56,7 +56,7 @@ std::string HtmlEntityDecode::evaluate(std::string value,
 }
 
 
-int HtmlEntityDecode::inplace(unsigned char *input, u_int64_t input_len) {
+int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
     unsigned char *d = input;
     int i, count;
 
diff --git a/src/actions/transformations/html_entity_decode.h b/src/actions/transformations/html_entity_decode.h
index 878b7b67..bd1b5250 100644
--- a/src/actions/transformations/html_entity_decode.h
+++ b/src/actions/transformations/html_entity_decode.h
@@ -39,7 +39,7 @@ class HtmlEntityDecode : public Transformation {
     std::string evaluate(std::string exp,
         Transaction *transaction) override;
 
-    static int inplace(unsigned char *input, u_int64_t input_len);
+    static int inplace(unsigned char *input, uint64_t input_len);
 };
 
 
diff --git a/src/actions/transformations/js_decode.cc b/src/actions/transformations/js_decode.cc
index 8dbbdb9f..be8fce45 100644
--- a/src/actions/transformations/js_decode.cc
+++ b/src/actions/transformations/js_decode.cc
@@ -57,7 +57,7 @@ std::string JsDecode::evaluate(std::string value,
 }
 
 
-int JsDecode::inplace(unsigned char *input, u_int64_t input_len) {
+int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
     unsigned char *d = (unsigned char *)input;
     int64_t i, count;
 
diff --git a/src/actions/transformations/js_decode.h b/src/actions/transformations/js_decode.h
index d1d3fa7e..86f6b330 100644
--- a/src/actions/transformations/js_decode.h
+++ b/src/actions/transformations/js_decode.h
@@ -35,7 +35,7 @@ class JsDecode : public Transformation {
 
     std::string evaluate(std::string exp,
         Transaction *transaction) override;
-    static int inplace(unsigned char *input, u_int64_t input_len);
+    static int inplace(unsigned char *input, uint64_t input_len);
 };
 
 }  // namespace transformations
diff --git a/src/actions/transformations/parity_even_7bit.cc b/src/actions/transformations/parity_even_7bit.cc
index e355036e..a1a877c1 100644
--- a/src/actions/transformations/parity_even_7bit.cc
+++ b/src/actions/transformations/parity_even_7bit.cc
@@ -54,8 +54,8 @@ std::string ParityEven7bit::evaluate(std::string value,
     return ret;
 }
 
-bool ParityEven7bit::inplace(unsigned char *input, u_int64_t input_len) {
-    u_int64_t i;
+bool ParityEven7bit::inplace(unsigned char *input, uint64_t input_len) {
+    uint64_t i;
 
     i = 0;
     while (i < input_len) {
diff --git a/src/actions/transformations/parity_even_7bit.h b/src/actions/transformations/parity_even_7bit.h
index 091f2192..672c406b 100644
--- a/src/actions/transformations/parity_even_7bit.h
+++ b/src/actions/transformations/parity_even_7bit.h
@@ -33,7 +33,7 @@ class ParityEven7bit : public Transformation {
     explicit ParityEven7bit(std::string action) : Transformation(action) { }
 
     std::string evaluate(std::string exp, Transaction *transaction) override;
-    static bool inplace(unsigned char *input, u_int64_t input_len);
+    static bool inplace(unsigned char *input, uint64_t input_len);
 };
 
 }  // namespace transformations
diff --git a/src/actions/transformations/parity_odd_7bit.cc b/src/actions/transformations/parity_odd_7bit.cc
index 5425973e..7c328ab7 100644
--- a/src/actions/transformations/parity_odd_7bit.cc
+++ b/src/actions/transformations/parity_odd_7bit.cc
@@ -54,8 +54,8 @@ std::string ParityOdd7bit::evaluate(std::string value,
     return ret;
 }
 
-bool ParityOdd7bit::inplace(unsigned char *input, u_int64_t input_len) {
-    u_int64_t i;
+bool ParityOdd7bit::inplace(unsigned char *input, uint64_t input_len) {
+    uint64_t i;
 
     i = 0;
     while (i < input_len) {
diff --git a/src/actions/transformations/parity_odd_7bit.h b/src/actions/transformations/parity_odd_7bit.h
index 542e0ab6..14fa9ff8 100644
--- a/src/actions/transformations/parity_odd_7bit.h
+++ b/src/actions/transformations/parity_odd_7bit.h
@@ -33,7 +33,7 @@ class ParityOdd7bit : public Transformation {
     explicit ParityOdd7bit(std::string action) : Transformation(action) { }
 
     std::string evaluate(std::string exp, Transaction *transaction) override;
-    static bool inplace(unsigned char *input, u_int64_t input_len);
+    static bool inplace(unsigned char *input, uint64_t input_len);
 };
 
 }  // namespace transformations
diff --git a/src/actions/transformations/parity_zero_7bit.cc b/src/actions/transformations/parity_zero_7bit.cc
index d8fd7ba8..e28f63d1 100644
--- a/src/actions/transformations/parity_zero_7bit.cc
+++ b/src/actions/transformations/parity_zero_7bit.cc
@@ -55,8 +55,8 @@ std::string ParityZero7bit::evaluate(std::string value,
 }
 
 
-bool ParityZero7bit::inplace(unsigned char *input, u_int64_t input_len) {
-    u_int64_t i;
+bool ParityZero7bit::inplace(unsigned char *input, uint64_t input_len) {
+    uint64_t i;
 
     i = 0;
     while (i < input_len) {
diff --git a/src/actions/transformations/parity_zero_7bit.h b/src/actions/transformations/parity_zero_7bit.h
index 9e43c78c..3904c3a4 100644
--- a/src/actions/transformations/parity_zero_7bit.h
+++ b/src/actions/transformations/parity_zero_7bit.h
@@ -33,7 +33,7 @@ class ParityZero7bit : public Transformation {
     explicit ParityZero7bit(std::string action) : Transformation(action) { }
 
     std::string evaluate(std::string exp, Transaction *transaction) override;
-    static bool inplace(unsigned char *input, u_int64_t input_len);
+    static bool inplace(unsigned char *input, uint64_t input_len);
 };
 
 }  // namespace transformations
diff --git a/src/actions/transformations/remove_comments.cc b/src/actions/transformations/remove_comments.cc
index c4e298c2..89a8c706 100644
--- a/src/actions/transformations/remove_comments.cc
+++ b/src/actions/transformations/remove_comments.cc
@@ -46,8 +46,8 @@ std::string RemoveComments::evaluate(std::string value,
 
     memcpy(input, value.c_str(), value.length()+1);
 
-    u_int64_t input_len = value.size();
-    u_int64_t i, j, incomment;
+    uint64_t input_len = value.size();
+    uint64_t i, j, incomment;
 
     i = j = incomment = 0;
     while (i < input_len) {
diff --git a/src/actions/transformations/url_decode_uni.cc b/src/actions/transformations/url_decode_uni.cc
index 75cc9513..83a1d6d3 100644
--- a/src/actions/transformations/url_decode_uni.cc
+++ b/src/actions/transformations/url_decode_uni.cc
@@ -62,7 +62,7 @@ std::string UrlDecodeUni::evaluate(std::string value,
  *
  * IMP1 Assumes NUL-terminated
  */
-int UrlDecodeUni::inplace(unsigned char *input, u_int64_t input_len,
+int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len,
     Transaction *transaction) {
     unsigned char *d = input;
     int64_t i, count, fact, j, xv;
diff --git a/src/actions/transformations/url_decode_uni.h b/src/actions/transformations/url_decode_uni.h
index cef96ec1..d7b913ce 100644
--- a/src/actions/transformations/url_decode_uni.h
+++ b/src/actions/transformations/url_decode_uni.h
@@ -33,7 +33,7 @@ class UrlDecodeUni : public Transformation {
     explicit UrlDecodeUni(std::string action) : Transformation(action) { }
 
     std::string evaluate(std::string exp, Transaction *transaction) override;
-    static int inplace(unsigned char *input, u_int64_t input_len,
+    static int inplace(unsigned char *input, uint64_t input_len,
         Transaction *transaction);
 };