Have /src files use header directly.

src/views/SkOSMenu.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkOSMenu.h"
 #include <stdarg.h>
 
 static int gOSMenuCmd = 7000;
 
 SkOSMenu::SkOSMenu(const char title[]) {
     fTitle.set(title);
 }
 
 SkOSMenu::~SkOSMenu() {
@@ skipping 236 matching lines @@
         const char* text = evt.findString(slotName);
         if (!text || !*text)
             return false;
         else {
             value->set(text);
             return true;
         }
     }
     return false;
 }