diff --git a/aksetup_helper.py b/aksetup_helper.py
index 91e9ac0c..812a62ed 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -536,7 +536,7 @@ def __init__(self, lib_base_name, default_lib_name=None):
                 default_lib_name = "boost_python-py%d%d" % sys.version_info[:2]
             else:
                 default_lib_name = "boost_%s" % lib_base_name
-
+                
         Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
                 [default_lib_name],
                 help="Library names for Boost C++ %s library (without lib or .so)"
diff --git a/setup.py b/setup.py
index 2a7acbe3..b3edf726 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,6 @@ def get_config_schema():
         ldflags_default.extend(["/FORCE"])
     elif "darwin" in sys.platform:
         import glob
-
         root_candidates = glob.glob("/Developer/NVIDIA/CUDA-*")
         if root_candidates:
             cuda_root_default = root_candidates[-1]
diff --git a/src/cpp/cuda.hpp b/src/cpp/cuda.hpp
index e3f8ef24..71be065d 100644
--- a/src/cpp/cuda.hpp
+++ b/src/cpp/cuda.hpp
@@ -407,8 +407,9 @@ namespace pycuda
 
   // {{{ device
   class context;
+#if CUDAPP_CUDA_VERSION >= 7000
   class primary_context;
-
+#endif
   class device
   {
     private:
@@ -829,9 +830,12 @@ namespace pycuda
       friend void context_push(boost::shared_ptr<context> ctx);
       friend boost::shared_ptr<context>
           gl::make_gl_context(device const &dev, unsigned int flags);
+#if CUDAPP_CUDA_VERSION >= 7000
       friend class primary_context;
+#endif
   };
 
+#if CUDAPP_CUDA_VERSION >= 7000
   class primary_context : public context
   {
    protected:
@@ -849,6 +853,7 @@ namespace pycuda
         CUDAPP_CALL_GUARDED_CLEANUP(cuDevicePrimaryCtxRelease, (m_device));
       }
   };
+#endif
 
   inline
   boost::shared_ptr<context> device::make_context(unsigned int flags)