diff --git a/lib/GridCore.h b/lib/GridCore.h
index 5fab4c71..cc1811af 100644
--- a/lib/GridCore.h
+++ b/lib/GridCore.h
@@ -38,16 +38,17 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #ifndef GRID_BASE_H
 #define GRID_BASE_H
 
+#include <Grid/DisableWarnings.h>
 #include <Grid/Namespace.h>
 #include <Grid/GridStd.h>
-
+#include <Grid/threads/Pragmas.h>
 #include <Grid/perfmon/Timer.h>
 #include <Grid/perfmon/PerfCount.h>
 #include <Grid/log/Log.h>
 #include <Grid/allocator/AlignedAllocator.h>
 #include <Grid/simd/Simd.h>
-#include <Grid/serialisation/Serialisation.h>
 #include <Grid/threads/Threads.h>
+#include <Grid/serialisation/Serialisation.h>
 #include <Grid/util/Util.h>
 #include <Grid/communicator/Communicator.h> 
 #include <Grid/cartesian/Cartesian.h>    
diff --git a/lib/Grid_Eigen_Dense.h b/lib/Grid_Eigen_Dense.h
index 4fb5b831..05a3d791 100644
--- a/lib/Grid_Eigen_Dense.h
+++ b/lib/Grid_Eigen_Dense.h
@@ -1,9 +1,27 @@
+#include <Grid/GridCore.h>
 #pragma once
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
+
+#ifdef GRID_NVCC
+#pragma push
+#pragma diag_suppress code_is_unreachable
+#undef __NVCC__
+#undef __CUDACC__
+#undef __CUDA_ARCH__
+#endif
+
 #include <Grid/Eigen/Dense>
+
+#ifdef GRID_NVCC
+#pragma pop
+#define __NVCC__
+#define __CUDACC__
+#define __CUDA_ARCH__
+#endif
+
 #if defined __GNUC__
 #pragma GCC diagnostic pop
 #endif