diff --git a/tgt-pcb/pcb.cc b/tgt-pcb/pcb.cc
index 547dc3a7b..60ad4d121 100644
--- a/tgt-pcb/pcb.cc
+++ b/tgt-pcb/pcb.cc
@@ -24,7 +24,9 @@
 # include "version_base.h"
 # include "version_tag.h"
 # include "pcb_config.h"
-# include  <string.h>
+# include  <cassert>
+# include  <cstdio>
+# include  <cstring>
 # include  "pcb_priv.h"
 # include  "ivl_target.h"
 
diff --git a/tgt-pcb/pcb_priv.h b/tgt-pcb/pcb_priv.h
index b98fceef0..466dbfd54 100644
--- a/tgt-pcb/pcb_priv.h
+++ b/tgt-pcb/pcb_priv.h
@@ -23,7 +23,7 @@
 # include  <set>
 # include  <list>
 # include  <map>
-# include  <ivl_target.h>
+# include  "ivl_target.h"
 
 extern int scan_scope(ivl_scope_t scope);
 
diff --git a/tgt-pcb/scope.cc b/tgt-pcb/scope.cc
index 22f8e25d4..0ea50a995 100644
--- a/tgt-pcb/scope.cc
+++ b/tgt-pcb/scope.cc
@@ -21,6 +21,7 @@
 # include <map>
 # include <string>
 # include <cassert>
+# include <cstdio>
 
 using namespace std;
 
diff --git a/tgt-pcb/show_netlist.cc b/tgt-pcb/show_netlist.cc
index a2a5d6be2..992be0c5e 100644
--- a/tgt-pcb/show_netlist.cc
+++ b/tgt-pcb/show_netlist.cc
@@ -18,6 +18,7 @@
  */
 
 # include  "pcb_priv.h"
+# include  <cassert>
 # include  <cstdio>
 
 using namespace std;
diff --git a/tgt-pcb/show_pcb.cc b/tgt-pcb/show_pcb.cc
index 02623bb90..42fd5299d 100644
--- a/tgt-pcb/show_pcb.cc
+++ b/tgt-pcb/show_pcb.cc
@@ -19,6 +19,8 @@
 
 # include  "pcb_config.h"
 # include  "pcb_priv.h"
+# include  <cassert>
+# include  <cstdio>
 
 using namespace std;