diff --git a/include_CLANG.mk b/include_CLANG.mk
index 913c44d..43328ee 100644
--- a/include_CLANG.mk
+++ b/include_CLANG.mk
@@ -5,8 +5,8 @@ ifeq ($(ENABLE_OPENMP),true)
 OPENMP   = -fopenmp
 endif
 
-CFLAGS   = -Ofast -ffreestanding -std=c99 -pthread $(OPENMP)
-LFLAGS   = -pthread $(OPENMP)
+CFLAGS   = -Ofast -ffreestanding -std=c99 $(OPENMP)
+LFLAGS   = $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
 LIBS     =
diff --git a/include_GCC.mk b/include_GCC.mk
index afdb9f1..d85fe65 100644
--- a/include_GCC.mk
+++ b/include_GCC.mk
@@ -5,8 +5,8 @@ ifeq ($(ENABLE_OPENMP),true)
 OPENMP   = -fopenmp
 endif
 
-CFLAGS   = -Ofast -ffreestanding -std=c99 -pthread $(OPENMP)
-LFLAGS   = -pthread $(OPENMP)
+CFLAGS   = -Ofast -ffreestanding -std=c99 $(OPENMP)
+LFLAGS   = $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
 LIBS     =
diff --git a/include_ICC.mk b/include_ICC.mk
index 8bc051d..dd1cb99 100644
--- a/include_ICC.mk
+++ b/include_ICC.mk
@@ -5,8 +5,8 @@ ifeq ($(ENABLE_OPENMP),true)
 OPENMP   = -qopenmp
 endif
 
-CFLAGS   = -qopt-report -Ofast -xHost -std=c99 -ffreestanding -pthread $(OPENMP)
-LFLAGS   = -pthread $(OPENMP)
+CFLAGS   = -qopt-report -Ofast -xHost -std=c99 -ffreestanding $(OPENMP)
+LFLAGS   = $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
 LIBS     =
diff --git a/src/affinity.c b/src/affinity.c
index 7d1663b..cc361c2 100644
--- a/src/affinity.c
+++ b/src/affinity.c
@@ -26,6 +26,7 @@
  */
 
 #ifdef __linux__
+#ifdef _OPENMP
 #include <stdlib.h>
 #include <stdio.h>
 #include <sched.h>
@@ -84,4 +85,5 @@ affinity_pinProcess(int processorId)
     CPU_SET(processorId, &cpuset);
     sched_setaffinity(0, sizeof(cpu_set_t), &cpuset);
 }
-#endif
+#endif /*__linux__*/
+#endif /*_OPENMP*/