diff --git a/alliance/src/ocp/src/common/PCommon.h b/alliance/src/ocp/src/common/PCommon.h
index 0ad45c23..a74efb80 100644
--- a/alliance/src/ocp/src/common/PCommon.h
+++ b/alliance/src/ocp/src/common/PCommon.h
@@ -1,11 +1,9 @@
 #ifndef __PCOMMON_H
 #define __PCOMMON_H
 #include <iostream>
-extern "C"{
 #include "mut.h"
 #include "mlo.h"
 #include "mph.h"
-}
 using namespace std;
 
 const double SquareShape(const double margin, const double sumwidth,
diff --git a/alliance/src/ocp/src/placer/Ocp.cpp b/alliance/src/ocp/src/placer/Ocp.cpp
index 64937792..0d4da1fc 100644
--- a/alliance/src/ocp/src/placer/Ocp.cpp
+++ b/alliance/src/ocp/src/placer/Ocp.cpp
@@ -3,11 +3,9 @@
 #include <iostream>
 #include <ctype.h>
 
-extern "C" {
 #include "mut.h"
 #include "mph.h"
 #include "mlo.h"
-}
 using namespace std;
 
 static void
diff --git a/alliance/src/ocp/src/placer/PCon.cpp b/alliance/src/ocp/src/placer/PCon.cpp
index 9268e883..2067340c 100644
--- a/alliance/src/ocp/src/placer/PCon.cpp
+++ b/alliance/src/ocp/src/placer/PCon.cpp
@@ -1,8 +1,6 @@
 #include "PCon.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PCon::PCon(const locon* con):
diff --git a/alliance/src/ocp/src/placer/PCon.h b/alliance/src/ocp/src/placer/PCon.h
index 2245eef1..d684c40c 100644
--- a/alliance/src/ocp/src/placer/PCon.h
+++ b/alliance/src/ocp/src/placer/PCon.h
@@ -2,10 +2,8 @@
 #define __PCON_H
 
 #include "PElem.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 
 class PCon: public PElem {
   private:
diff --git a/alliance/src/ocp/src/placer/PDetToPlaceIns.cpp b/alliance/src/ocp/src/placer/PDetToPlaceIns.cpp
index 43c1535e..d8192011 100644
--- a/alliance/src/ocp/src/placer/PDetToPlaceIns.cpp
+++ b/alliance/src/ocp/src/placer/PDetToPlaceIns.cpp
@@ -1,8 +1,6 @@
 #include "PDetToPlaceIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 #include "PToPlaceIns.h"
 #include "PDetSubRow.h"
diff --git a/alliance/src/ocp/src/placer/PFixedIns.h b/alliance/src/ocp/src/placer/PFixedIns.h
index 5579d3b0..49d93ae2 100644
--- a/alliance/src/ocp/src/placer/PFixedIns.h
+++ b/alliance/src/ocp/src/placer/PFixedIns.h
@@ -3,10 +3,8 @@
 
 #include "PIns.h"
 #include "PPos.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 
 class PFixedIns : public PIns {
     
diff --git a/alliance/src/ocp/src/placer/PIns.cpp b/alliance/src/ocp/src/placer/PIns.cpp
index 86fa8c06..578258df 100644
--- a/alliance/src/ocp/src/placer/PIns.cpp
+++ b/alliance/src/ocp/src/placer/PIns.cpp
@@ -1,8 +1,6 @@
 #include "PIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PIns::PIns(const loins *instance):
diff --git a/alliance/src/ocp/src/placer/PIns.h b/alliance/src/ocp/src/placer/PIns.h
index 6608ea36..2dd93f22 100644
--- a/alliance/src/ocp/src/placer/PIns.h
+++ b/alliance/src/ocp/src/placer/PIns.h
@@ -3,10 +3,8 @@
 
 #include "PElem.h"
 #include "PBBox.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 
 class PIns: public PElem {
     
diff --git a/alliance/src/ocp/src/placer/PNet.h b/alliance/src/ocp/src/placer/PNet.h
index 97b1816e..eb19bc0e 100644
--- a/alliance/src/ocp/src/placer/PNet.h
+++ b/alliance/src/ocp/src/placer/PNet.h
@@ -4,10 +4,8 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 using namespace std;
 
 class PElem;
diff --git a/alliance/src/ocp/src/placer/PPlacement.cpp b/alliance/src/ocp/src/placer/PPlacement.cpp
index 8c5fc8e4..5ff6a161 100644
--- a/alliance/src/ocp/src/placer/PPlacement.cpp
+++ b/alliance/src/ocp/src/placer/PPlacement.cpp
@@ -3,13 +3,11 @@
 #include <set>
 #include <algorithm>
 #include <string>
-extern "C"{
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
-}
 #include "PMove.h"
 #include "PConstants.h"
 #include "PCommon.h"
diff --git a/alliance/src/ocp/src/placer/PPlacement.h b/alliance/src/ocp/src/placer/PPlacement.h
index 9e3b7bec..2dab6a05 100644
--- a/alliance/src/ocp/src/placer/PPlacement.h
+++ b/alliance/src/ocp/src/placer/PPlacement.h
@@ -12,10 +12,8 @@
 #include "PONet.h"
 #include "PBBox.h"
 #include "PDetSubRow.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 #include "iocheader.h"
 using namespace std;
 
diff --git a/alliance/src/ocp/src/placer/PPlacementFinal.cpp b/alliance/src/ocp/src/placer/PPlacementFinal.cpp
index 6fa1b346..3e09f686 100644
--- a/alliance/src/ocp/src/placer/PPlacementFinal.cpp
+++ b/alliance/src/ocp/src/placer/PPlacementFinal.cpp
@@ -6,13 +6,11 @@
 #include "PMove.h"
 #include "PConstants.h"
 #include "PDetPlacement.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
-}
 
 double
 PPlacement::DetPlaceDebugNetCost()
diff --git a/alliance/src/ocp/src/placer/PToPlaceIns.cpp b/alliance/src/ocp/src/placer/PToPlaceIns.cpp
index 1ac282c6..6cbd39b5 100644
--- a/alliance/src/ocp/src/placer/PToPlaceIns.cpp
+++ b/alliance/src/ocp/src/placer/PToPlaceIns.cpp
@@ -1,8 +1,6 @@
 #include "PToPlaceIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PToPlaceIns::PToPlaceIns(const loins *instance):