diff --git a/src/pke/include/constants.h b/src/pke/include/constants.h
index 92cca1376..299f9c1d5 100644
--- a/src/pke/include/constants.h
+++ b/src/pke/include/constants.h
@@ -34,8 +34,7 @@
 #ifndef _CONSTANTS_H_
 #define _CONSTANTS_H_
 
-#include "constants-defs.h"             // all enum definitions
-#include "lattice/constants-lattice.h"  // additional definitions
+#include "constants-defs.h"  // all enum definitions
 
 #include <iosfwd>
 #include <string>
diff --git a/src/pke/include/scheme/gen-cryptocontext-params.h b/src/pke/include/scheme/gen-cryptocontext-params.h
index c78a8edcf..84fc5700d 100644
--- a/src/pke/include/scheme/gen-cryptocontext-params.h
+++ b/src/pke/include/scheme/gen-cryptocontext-params.h
@@ -39,6 +39,7 @@
 #include "scheme/scheme-id.h"
 #include "utils/inttypes.h"
 #include "constants.h"
+#include "lattice/constants-lattice.h"
 #include "lattice/stdlatticeparms.h"
 
 #include <iosfwd>
diff --git a/src/pke/include/schemebase/rlwe-cryptoparameters.h b/src/pke/include/schemebase/rlwe-cryptoparameters.h
index cb8c2c557..ef5b15cfc 100644
--- a/src/pke/include/schemebase/rlwe-cryptoparameters.h
+++ b/src/pke/include/schemebase/rlwe-cryptoparameters.h
@@ -42,6 +42,7 @@
 #include "lattice/lat-hal.h"
 #include "schemebase/base-cryptoparameters.h"
 #include "constants.h"
+#include "lattice/constants-lattice.h"
 
 // TODO - temp include for the SecurityLevel
 #include "lattice/stdlatticeparms.h"