diff --git a/src/gui/character_pad/windows_selection_handler.h b/src/gui/character_pad/windows_selection_handler.h
index 571c2be..5391899 100644
--- a/src/gui/character_pad/windows_selection_handler.h
+++ b/src/gui/character_pad/windows_selection_handler.h
@@ -28,7 +28,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef MOZC_GUI_CHARACTER_PAD_WINDOWS_SELECTION_HANDLER_H_
-#define MOZC_IPC_CHARACTER_PAD_WINDOWS_SELECTION_HANDLER_H_
+#define MOZC_GUI_CHARACTER_PAD_WINDOWS_SELECTION_HANDLER_H_
 
 #include <string>
 
@@ -48,4 +48,4 @@
 }
 }
 #endif
-#endif  // MOZC_IPC_CHARACTER_PAD_WINDOWS_SELECTION_HANDLER_H_
+#endif  // MOZC_GUI_CHARACTER_PAD_WINDOWS_SELECTION_HANDLER_H_
diff --git a/src/gui/config_dialog/combobox_delegate.h b/src/gui/config_dialog/combobox_delegate.h
index 6702a27..e0bd1f5 100644
--- a/src/gui/config_dialog/combobox_delegate.h
+++ b/src/gui/config_dialog/combobox_delegate.h
@@ -28,7 +28,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef MOZC_GUI_CONFIG_DIALOG_COMBOBOX_DELEGATE_H_
-#define MOZC_GUI_CONFIG_DIALOG_COMBOBOX_FORM_DELEGATE_H_
+#define MOZC_GUI_CONFIG_DIALOG_COMBOBOX_DELEGATE_H_
 
 #include <QtCore/QModelIndex>
 #include <QtCore/QObject>
@@ -71,4 +71,4 @@
 };
 }  // gui
 }  // mozc
-#endif  // MOZC_GUI_CONFIG_DIALOG_CHARACTER_FORM_DELEGATE_H_
+#endif  // MOZC_GUI_CONFIG_DIALOG_COMBOBOX_DELEGATE_H_
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 457d0c4..06505c4 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2022
+BUILD=2023
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.