diff --git a/src/metadata.cc b/src/metadata.cc
index d82ddec3..06c6ff0c 100755
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -6,8 +6,23 @@
 #include "common.h"
 #include "metadata.h"
 
-using namespace v8;
-using namespace sharp;
+using v8::Handle;
+using v8::Local;
+using v8::Value;
+using v8::Object;
+using v8::Number;
+using v8::String;
+using v8::Boolean;
+using v8::Function;
+using v8::Exception;
+
+using sharp::ImageType;
+using sharp::DetermineImageType;
+using sharp::InitImage;
+using sharp::HasProfile;
+using sharp::HasAlpha;
+using sharp::ExifOrientation;
+using sharp::counterQueue;
 
 struct MetadataBaton {
   // Input
diff --git a/src/sharp.cc b/src/sharp.cc
index cc679105..fbce3150 100755
--- a/src/sharp.cc
+++ b/src/sharp.cc
@@ -8,7 +8,9 @@
 #include "resize.h"
 #include "utilities.h"
 
-using namespace v8;
+using v8::Handle;
+using v8::Object;
+using node::AtExit;
 
 static void at_exit(void* arg) {
   NanScope();
@@ -18,7 +20,7 @@ static void at_exit(void* arg) {
 extern "C" void init(Handle<Object> target) {
   NanScope();
   vips_init("sharp");
-  node::AtExit(at_exit);
+  AtExit(at_exit);
 
   // Set libvips operation cache limits
   vips_cache_set_max_mem(100 * 1048576); // 100 MB
diff --git a/src/utilities.cc b/src/utilities.cc
index 4aaa356b..7911b3de 100755
--- a/src/utilities.cc
+++ b/src/utilities.cc
@@ -6,8 +6,13 @@
 #include "common.h"
 #include "utilities.h"
 
-using namespace v8;
-using namespace sharp;
+using v8::Local;
+using v8::Object;
+using v8::Number;
+using v8::String;
+
+using sharp::counterQueue;
+using sharp::counterProcess;
 
 /*
   Get and set cache memory and item limits
diff --git a/test/unit/cpplint.js b/test/unit/cpplint.js
index 546442e0..a3232f87 100755
--- a/test/unit/cpplint.js
+++ b/test/unit/cpplint.js
@@ -22,8 +22,7 @@ describe('cpplint', function() {
           },
           build: {
             include: false,
-            include_order: false,
-            namespaces: false
+            include_order: false
           },
           whitespace: {
             blank_line: false,