diff --git a/lib/ts/ContFlags.h b/lib/ts/ContFlags.h
index f581c81e9b3..8e57cec8d7c 100644
--- a/lib/ts/ContFlags.h
+++ b/lib/ts/ContFlags.h
@@ -43,9 +43,9 @@ class ContFlags
   enum flags { DEBUG_OVERRIDE = 0, DISABLE_PLUGINS = 1, LAST_FLAG };
 
   ContFlags() : raw_flags(0) {}
-  ContFlags(u_int32_t in_flags) : raw_flags(in_flags) {}
+  ContFlags(uint32_t in_flags) : raw_flags(in_flags) {}
   void
-  set_flags(u_int32_t new_flags)
+  set_flags(uint32_t new_flags)
   {
     raw_flags = new_flags;
   }
@@ -55,7 +55,7 @@ class ContFlags
     return *this;
   }
 
-  u_int32_t
+  uint32_t
   get_flags() const
   {
     return raw_flags;
@@ -81,7 +81,7 @@ class ContFlags
   }
 
 private:
-  u_int32_t raw_flags;
+  uint32_t raw_flags;
 };
 
 void init_cont_flags();
diff --git a/lib/ts/ink_resource.cc b/lib/ts/ink_resource.cc
index b1c4d6a234d..d4180b9bd4c 100644
--- a/lib/ts/ink_resource.cc
+++ b/lib/ts/ink_resource.cc
@@ -69,7 +69,7 @@ class Resource
   setName(const void *symbol, const char *name)
   {
     Dl_info info;
-    dladdr(symbol, &info);
+    dladdr(const_cast<void *>(symbol), &info);
     snprintf(_name, sizeof(_name), "%s/%s", name, info.dli_sname);
   }
   const char *
diff --git a/plugins/experimental/cachekey/configs.cc b/plugins/experimental/cachekey/configs.cc
index f86523458a1..7a459d1ef76 100644
--- a/plugins/experimental/cachekey/configs.cc
+++ b/plugins/experimental/cachekey/configs.cc
@@ -324,19 +324,19 @@ Configs::loadClassifiers(const String &args, bool blacklist)
 bool
 Configs::init(int argc, char *argv[])
 {
-  static const struct option longopt[] = {{"exclude-params", optional_argument, 0, 'a'},
-                                          {"include-params", optional_argument, 0, 'b'},
-                                          {"include-match-params", optional_argument, 0, 'c'},
-                                          {"exclude-match-params", optional_argument, 0, 'd'},
-                                          {"sort-params", optional_argument, 0, 'e'},
-                                          {"remove-all-params", optional_argument, 0, 'f'},
-                                          {"include-headers", optional_argument, 0, 'g'},
-                                          {"include-cookies", optional_argument, 0, 'h'},
-                                          {"ua-capture", optional_argument, 0, 'i'},
-                                          {"static-prefix", optional_argument, 0, 'j'},
-                                          {"capture-prefix", optional_argument, 0, 'k'},
-                                          {"ua-whitelist", optional_argument, 0, 'l'},
-                                          {"ua-blacklist", optional_argument, 0, 'm'},
+  static const struct option longopt[] = {{const_cast<char *>("exclude-params"), optional_argument, 0, 'a'},
+                                          {const_cast<char *>("include-params"), optional_argument, 0, 'b'},
+                                          {const_cast<char *>("include-match-params"), optional_argument, 0, 'c'},
+                                          {const_cast<char *>("exclude-match-params"), optional_argument, 0, 'd'},
+                                          {const_cast<char *>("sort-params"), optional_argument, 0, 'e'},
+                                          {const_cast<char *>("remove-all-params"), optional_argument, 0, 'f'},
+                                          {const_cast<char *>("include-headers"), optional_argument, 0, 'g'},
+                                          {const_cast<char *>("include-cookies"), optional_argument, 0, 'h'},
+                                          {const_cast<char *>("ua-capture"), optional_argument, 0, 'i'},
+                                          {const_cast<char *>("static-prefix"), optional_argument, 0, 'j'},
+                                          {const_cast<char *>("capture-prefix"), optional_argument, 0, 'k'},
+                                          {const_cast<char *>("ua-whitelist"), optional_argument, 0, 'l'},
+                                          {const_cast<char *>("ua-blacklist"), optional_argument, 0, 'm'},
                                           {0, 0, 0, 0}};
 
   bool status = true;
diff --git a/plugins/experimental/cachekey/pattern.h b/plugins/experimental/cachekey/pattern.h
index 69df978e0cc..57e7bfcec7f 100644
--- a/plugins/experimental/cachekey/pattern.h
+++ b/plugins/experimental/cachekey/pattern.h
@@ -24,7 +24,14 @@
 #ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_
 #define PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_
 
-#include <pcre.h> /* pcre, pcre_extra, pcre_exec */
+#include "ts/ink_defs.h"
+
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
+#include <pcre.h>
+#endif
+
 #include "common.h"
 
 /**