Refactored Non-SFI and SFI NaCl into separate directories.

mojo/nacl/sfi/nacl_bindings/mojo_syscall_internal.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_
-#define MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_
+#ifndef MOJO_NACL_SFI_NACL_BINDINGS_MOJO_SYSCALL_INTERNAL_H_
+#define MOJO_NACL_SFI_NACL_BINDINGS_MOJO_SYSCALL_INTERNAL_H_
 
 #include <type_traits>
 
 #include "native_client/src/trusted/service_runtime/nacl_copy.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
 namespace {
 
 class ScopedCopyLock {
  public:
@@ skipping 211 matching lines @@
     }
   } else if (optional) {
     *sys_ptr = 0;
     return true;
   }
   return false;
 }
 
 }  // namespace
 
-#endif  // MOJO_NACL_MOJO_SYSCALL_INTERNAL_H_
+#endif  // MOJO_NACL_SFI_NACL_BINDINGS_MOJO_SYSCALL_INTERNAL_H_