From fc3d81e73a1b5eb630aa3f8d5c1c72b148001bad Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Thu, 18 Jun 2020 15:58:16 -0400
Subject: [PATCH] cleanups related to prior commits

---
 desmume/src/firmware.cpp                 | 5 +++--
 desmume/src/firmware.h                   | 3 +++
 desmume/src/frontend/windows/memView.cpp | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/desmume/src/firmware.cpp b/desmume/src/firmware.cpp
index 9003e1052..7d2907660 100644
--- a/desmume/src/firmware.cpp
+++ b/desmume/src/firmware.cpp
@@ -22,6 +22,7 @@
 #include "path.h"
 #include "encrypt.h"
 #include "wifi.h"
+#include "version.h"
 
 #define DFC_ID_CODE	"DeSmuME Firmware User Settings"
 #define DFC_ID_SIZE	sizeof(DFC_ID_CODE)
@@ -31,8 +32,8 @@
 #define DFC_FILE_SIZE (SETTINGS_SIZE + DFC_ID_SIZE)
 
 static _KEY1	enc(&MMU.ARM7_BIOS[0x0030]);
-static const char *defaultNickname = "DeSmuME";
-static const char *defaultMessage = "DeSmuME makes you happy!";
+const char *defaultNickname = DESMUME_NAME;
+const char *defaultMessage = DESMUME_NAME " makes you happy!";
 
 u16 CFIRMWARE::_getBootCodeCRC16(const u8 *arm9Data, const u32 arm9Size, const u8 *arm7Data, const u32 arm7Size)
 {
diff --git a/desmume/src/firmware.h b/desmume/src/firmware.h
index acb431124..eb745ac04 100644
--- a/desmume/src/firmware.h
+++ b/desmume/src/firmware.h
@@ -33,6 +33,9 @@
 #define MAX_FW_NICKNAME_LENGTH 10
 #define MAX_FW_MESSAGE_LENGTH 26
 
+extern const char *defaultNickname;
+extern const char *defaultMessage;
+
 struct FirmwareConfig
 {
 	u8 consoleType;
diff --git a/desmume/src/frontend/windows/memView.cpp b/desmume/src/frontend/windows/memView.cpp
index fb98c16af..05ff757b2 100644
--- a/desmume/src/frontend/windows/memView.cpp
+++ b/desmume/src/frontend/windows/memView.cpp
@@ -29,6 +29,7 @@
 
 #include "resource.h"
 #include "winutil.h"
+#include "version.h"
 
 using namespace std;