diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index 19e9eb75fc20..7a237d0a7ebc 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -7,6 +7,7 @@ SRCS=	libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
 INCS=	pmc.h pmclog.h pmcformat.h
 
 CFLAGS+= -I${.CURDIR}
+CWARNFLAGS.gcc+= -Wno-shadow
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 
diff --git a/usr.sbin/pmc/Makefile b/usr.sbin/pmc/Makefile
index c0a48372b0ae..2f94d3e274ef 100644
--- a/usr.sbin/pmc/Makefile
+++ b/usr.sbin/pmc/Makefile
@@ -5,7 +5,8 @@
 .include <src.opts.mk>
 PROG_CXX=	pmc
 MAN=	
-CXXFLAGS+= -O0
+CXXFLAGS+= -O0 -std=c++14
+CWARNFLAGS.gcc+= -Wno-redundant-decls
 
 LIBADD=	kvm pmc m ncursesw pmcstat elf
 
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index 6a0a584f8dd9..c7675edda4c5 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <libpmcstat.h>
 #include "cmd_pmc.h"
 
-#include <iostream>
 #include <string>
 #include <unordered_map>
 
@@ -182,11 +181,11 @@ static void
 pmc_log_event(int fd, struct pmclog_ev *ev, bool json)
 {
 	int len;
-	void *buf;
+	const void *buf;
 
 	if (json) {
 		string ret = event_to_json(ev);
-		buf = (void*)ret.c_str();
+		buf = ret.c_str();
 		len = ret.size();
 	} else {
 		len = ev->pl_len;
@@ -233,7 +232,7 @@ pmc_filter_handler(uint32_t *lwplist, int lwpcount, uint32_t *pidlist, int pidco
 	pmclog_close(ps);
 	if ((ps = static_cast < struct pmclog_parse_state *>(pmclog_open(infd)))== NULL)
 		errx(EX_OSERR, "ERROR: Cannot allocate pmclog parse state: %s\n", strerror(errno));
-	if ((pe = (typeof(pe)) malloc(sizeof(*pe) * pmccount)) == NULL)
+	if ((pe = (struct pmcid_ent *) malloc(sizeof(*pe) * pmccount)) == NULL)
 		errx(EX_OSERR, "ERROR: failed to allocate pmcid map");
 	i = 0;
 	while (pmclog_read(ps, &ev) == 0 && i < pmccount) {