diff --git a/Grid/json/json.hpp b/Grid/json/json.hpp
index 618aa7a1..5b5d2215 100644
--- a/Grid/json/json.hpp
+++ b/Grid/json/json.hpp
@@ -1,4 +1,3 @@
-#ifndef __NVCC__
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
@@ -18918,5 +18917,4 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
 #undef NLOHMANN_BASIC_JSON_TPL
 
 
-#endif
-#endif
+#endif
\ No newline at end of file
diff --git a/Grid/serialisation/JSON_IO.cc b/Grid/serialisation/JSON_IO.cc
index f2282099..e47a2969 100644
--- a/Grid/serialisation/JSON_IO.cc
+++ b/Grid/serialisation/JSON_IO.cc
@@ -26,7 +26,7 @@
     *************************************************************************************/
     /*  END LEGAL */
 #include <Grid/Grid.h>
-#if (!defined(GRID_CUDA)) && (!defined(GRID_HIP))
+#ifndef GRID_HIP
 
 NAMESPACE_BEGIN(Grid);
 
diff --git a/Grid/serialisation/Serialisation.h b/Grid/serialisation/Serialisation.h
index e14120af..4f395be2 100644
--- a/Grid/serialisation/Serialisation.h
+++ b/Grid/serialisation/Serialisation.h
@@ -36,7 +36,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include "BinaryIO.h"
 #include "TextIO.h"
 #include "XmlIO.h"
-#if (!defined(GRID_CUDA)) && (!defined(GRID_HIP))
+#ifndef GRID_HIP
 #include "JSON_IO.h"
 #endif