4 files changed, 9 insertions, 10 deletions
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index 3400c85..69edfb0 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -10,7 +10,6 @@
 #include "base/string_number_conversions.h"
 #include "sync/internal_api/public/base/node_ordinal.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
-#include "sync/syncable/delete_journal.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index 5f2ae90..6aa10b2 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -14,11 +14,11 @@
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
 #include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/syncable/delete_journal.h"
 #include "sync/syncable/dir_open_result.h"
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/metahandle_set.h"
 #include "sync/syncable/scoped_kernel_lock.h"
+#include "sync/syncable/syncable_delete_journal.h"
 
 namespace syncer {
 
diff --git a/sync/syncable/delete_journal.cc b/sync/syncable/syncable_delete_journal.cc
index 1f92def..0aa04fa 100644
--- a/sync/syncable/delete_journal.cc
+++ b/sync/syncable/syncable_delete_journal.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "sync/syncable/delete_journal.h"
+#include "sync/syncable/syncable_delete_journal.h"
 
 #include "base/stl_util.h"
 #include "sync/internal_api/public/base/model_type.h"
diff --git a/sync/syncable/delete_journal.h b/sync/syncable/syncable_delete_journal.h
index 5b9d044..7d4224f 100644
--- a/sync/syncable/delete_journal.h
+++ b/sync/syncable/syncable_delete_journal.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 SYNC_SYNCABLE_DELETE_JOURNAL_H_
-#define SYNC_SYNCABLE_DELETE_JOURNAL_H_
+#ifndef SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_
+#define SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_
 
 #include <set>
 
@@ -100,4 +100,4 @@ class DeleteJournal {
 }  // namespace syncable
 }  // namespace syncer
 
-#endif  // SYNC_SYNCABLE_DELETE_JOURNAL_H_
+#endif  // SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_