diff --git a/src/aig/gia/giaKf.c b/src/aig/gia/giaKf.c index a823f7262..6909851f1 100644 --- a/src/aig/gia/giaKf.c +++ b/src/aig/gia/giaKf.c @@ -21,13 +21,18 @@ #include "gia.h" #include "misc/vec/vecSet.h" +#ifdef _MSC_VER +#define unlink _unlink +#else +#include +#endif + #ifdef ABC_USE_PTHREADS #ifdef _WIN32 #include "../lib/pthread.h" #else #include -#include #endif #endif diff --git a/src/aig/gia/giaStoch.c b/src/aig/gia/giaStoch.c index 57775b5cc..78fe2cb67 100644 --- a/src/aig/gia/giaStoch.c +++ b/src/aig/gia/giaStoch.c @@ -22,6 +22,11 @@ #include "base/main/main.h" #include "base/cmd/cmd.h" +#ifdef _MSC_VER +#define unlink _unlink +#else +#include +#endif #ifdef ABC_USE_PTHREADS @@ -29,7 +34,6 @@ #include "../lib/pthread.h" #else #include -#include #endif #endif diff --git a/src/aig/gia/giaTranStoch.c b/src/aig/gia/giaTranStoch.c index efc358dde..aa600c0c0 100644 --- a/src/aig/gia/giaTranStoch.c +++ b/src/aig/gia/giaTranStoch.c @@ -29,13 +29,18 @@ #include #include +#ifdef _MSC_VER +#define unlink _unlink +#else +#include +#endif + #ifdef ABC_USE_PTHREADS #ifdef _WIN32 #include "../lib/pthread.h" #else #include -#include #endif #endif diff --git a/src/sat/cnf/cnfUtil.c b/src/sat/cnf/cnfUtil.c index 7886b8a3b..e67328171 100644 --- a/src/sat/cnf/cnfUtil.c +++ b/src/sat/cnf/cnfUtil.c @@ -21,8 +21,6 @@ #include "cnf.h" #include "sat/bsat/satSolver.h" -ABC_NAMESPACE_IMPL_START - #ifdef _MSC_VER #define unlink _unlink #else @@ -39,6 +37,8 @@ ABC_NAMESPACE_IMPL_START #endif +ABC_NAMESPACE_IMPL_START + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// ////////////////////////////////////////////////////////////////////////