diff --git a/src/RandomCPU.h b/src/RandomCPU.h
index 0f5c79ce10f1d8d0d970beaf3e45e3e5e5259623..5b56cd5e7898ed94ef6a39c5a89a50c26f09bddd 100644
--- a/src/RandomCPU.h
+++ b/src/RandomCPU.h
@@ -34,7 +34,7 @@
 #define DEVICE 
 #endif
 
-#include "common.h"
+#include "namd_common.h"
 #include "useful.h"
 
 #ifdef _MSC_VER
diff --git a/src/RandomCUDA.h b/src/RandomCUDA.h
index 79740d4de277656a15857385a1111cef4349fe3f..88e70b041f4f60a5cd9dfb7daebaf9cac07f504d 100644
--- a/src/RandomCUDA.h
+++ b/src/RandomCUDA.h
@@ -9,7 +9,6 @@
 #include <curand_kernel.h>
 #include <curand.h>
 
-#include "common.h"
 #include "useful.h"
 #include "ComputeForce.h"
 
diff --git a/src/SignalManager.cpp b/src/SignalManager.cpp
index 08a87ac7f202d2f7674527bc32a21a26cc95e03e..47b28668eaf91271383b5f6ebb05fbbca5a39b68 100644
--- a/src/SignalManager.cpp
+++ b/src/SignalManager.cpp
@@ -2,7 +2,7 @@
 #include <cstdio>
 #include <cstdlib>
 #ifdef SIGNAL
-#include "common.h"
+
 //#include "ARBDException.h"
 
 void SignalManager::segfault_handler(int sig, siginfo_t *info, void *secret) 
diff --git a/src/common.h b/src/namd_common.h
similarity index 100%
rename from src/common.h
rename to src/namd_common.h