diff --git a/src/ComputeForce.cuh b/src/ComputeForce.cuh
index b92feea10cf6dd678cd22b7f3af9d8582617d861..eb619c91cf054511913d6e0bb9756b12765f2bc1 100644
--- a/src/ComputeForce.cuh
+++ b/src/ComputeForce.cuh
@@ -6,7 +6,7 @@
 #include "CudaUtil.cuh"
 #include "TabulatedMethods.cuh"
 
-constexpr float BD_PI = 3.1415927f;
+// From TabulatedMethods.cuh: constexpr float BD_PI = 3.1415927f; 
 constexpr size_t MAX_CELLS_FOR_CELLNEIGHBORLIST = 1<<25;
 constexpr size_t MAX_NLIST_PAIRS = 1<<27; // Reduce if ARBD crashes immediately with GPU memory allocation error
 
diff --git a/src/TabulatedDihedral.cu b/src/TabulatedDihedral.cu
index c182482df290a53cb9ff51d2842613efa514ef70..c70008d6eec9102fbe377e17237682ee23f6a43a 100644
--- a/src/TabulatedDihedral.cu
+++ b/src/TabulatedDihedral.cu
@@ -3,7 +3,6 @@
 
 #include "TabulatedDihedral.h"
 #include <cassert>
-#define BD_PI 3.1415927f
 
 TabulatedDihedralPotential::TabulatedDihedralPotential() :
 		pot(NULL), size(0), fileName("") {}
diff --git a/src/TabulatedDihedral.h b/src/TabulatedDihedral.h
index 1defc9d86600b6a21238466edb7d8d0a036e5a64..e806e2dab95b4ddc855f6807266cb8715c82d64d 100644
--- a/src/TabulatedDihedral.h
+++ b/src/TabulatedDihedral.h
@@ -13,7 +13,7 @@
 // #include <math.h>
 // #define _USING_MATH_DEFINES
 
-#define BD_PI 3.1415927f
+constexpr float BD_PI = 3.1415927f;
 
 class TabulatedDihedralPotential {
 public:
diff --git a/src/TabulatedMethods.cuh b/src/TabulatedMethods.cuh
index ef4665c79f0a77071814cc62d7135ce7aac5da09..d92809c99ce0206d8b4b380a6cc08abf3b692112 100644
--- a/src/TabulatedMethods.cuh
+++ b/src/TabulatedMethods.cuh
@@ -1,6 +1,6 @@
 #pragma once
 
-#define BD_PI 3.1415927f
+// Defined elsewhere: constexpr float BD_PI = 3.1415927f;
 
 __device__ inline void computeAngle(const TabulatedAnglePotential* __restrict__ a, const BaseGrid* __restrict__ sys, Vector3* force, const Vector3* __restrict__ pos,
 				const int& i, const int& j, const int& k, float* energy, bool get_energy) {