diff --git a/src/debug.h b/src/debug.h
index 3898e84..951acd5 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -121,7 +121,7 @@
   void SetDebugBreak();
   void ClearDebugBreak();
 
-  DISALLOW_EVIL_CONSTRUCTORS(BreakLocationIterator);
+  DISALLOW_COPY_AND_ASSIGN(BreakLocationIterator);
 };
 
 
@@ -317,7 +317,7 @@
   // Code to call for handling debug break on return.
   static Code* debug_break_return_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Debug);
+  DISALLOW_COPY_AND_ASSIGN(Debug);
 };
 
 
@@ -346,8 +346,6 @@
   static Handle<String> ProcessRequest(Handle<Object> exec_state,
                                        Handle<Object> request,
                                        bool stopped);
-  static bool IsPlainBreakRequest(Handle<Object> request);
-
   static void OnDebugBreak(Handle<Object> break_points_hit);
   static void OnException(Handle<Object> exception, bool uncaught);
   static void OnBeforeCompile(Handle<Script> script);
@@ -422,7 +420,7 @@
  private:
   MessageQueue queue_;
   Mutex* lock_;
-  DISALLOW_EVIL_CONSTRUCTORS(LockingMessageQueue);
+  DISALLOW_COPY_AND_ASSIGN(LockingMessageQueue);
 };
 
 
@@ -465,7 +463,7 @@
   static const int kQueueInitialSize = 4;
   LockingMessageQueue command_queue_;
   LockingMessageQueue message_queue_;
-  DISALLOW_EVIL_CONSTRUCTORS(DebugMessageThread);
+  DISALLOW_COPY_AND_ASSIGN(DebugMessageThread);
 };