diff --git a/module/Library/MMDB.cpp b/module/Library/MMDB.cpp
index 47366375..d2d28551 100644
--- a/module/Library/MMDB.cpp
+++ b/module/Library/MMDB.cpp
@@ -440,7 +440,7 @@ SQInteger SockAddr::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void SockAddr::Validate(CCStr file, int32_t line) const
+void SockAddr::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -459,7 +459,7 @@ void SockAddr::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-SockAddr::Pointer SockAddr::GetValid(CCStr file, int32_t line) const
+SockAddr::Pointer SockAddr::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
@@ -547,7 +547,7 @@ SQInteger Database::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void Database::Validate(CCStr file, int32_t line) const
+void Database::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -566,7 +566,7 @@ void Database::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const DbRef & Database::GetValid(CCStr file, int32_t line) const
+const DbRef & Database::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
@@ -683,7 +683,7 @@ SQInteger Description::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void Description::Validate(CCStr file, int32_t line) const
+void Description::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -702,7 +702,7 @@ void Description::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-Description::Pointer Description::GetValid(CCStr file, int32_t line) const
+Description::Pointer Description::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     // Validate the referenced description
@@ -743,7 +743,7 @@ SQInteger EntryData::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void EntryData::Validate(CCStr file, int32_t line) const
+void EntryData::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -762,7 +762,7 @@ void EntryData::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-EntryData::ConstRef EntryData::GetValid(CCStr file, int32_t line) const
+EntryData::ConstRef EntryData::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     // See if the entry has any data
@@ -817,7 +817,7 @@ SQInteger EntryDataList::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void EntryDataList::Validate(CCStr file, int32_t line) const
+void EntryDataList::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -836,7 +836,7 @@ void EntryDataList::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-EntryDataList::Pointer EntryDataList::GetValid(CCStr file, int32_t line) const
+EntryDataList::Pointer EntryDataList::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     // Validate the managed list
@@ -863,7 +863,7 @@ EntryDataList::Pointer EntryDataList::GetValid() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-EntryDataList::Pointer EntryDataList::GetValidElem(CCStr file, int32_t line) const
+EntryDataList::Pointer EntryDataList::GetValidElem(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     // Validate the current element
@@ -975,7 +975,7 @@ SQInteger LookupResult::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void LookupResult::Validate(CCStr file, int32_t line) const
+void LookupResult::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -994,7 +994,7 @@ void LookupResult::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const DbRef & LookupResult::GetValid(CCStr file, int32_t line) const
+const DbRef & LookupResult::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
@@ -1135,7 +1135,7 @@ SQInteger Metadata::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void Metadata::Validate(CCStr file, int32_t line) const
+void Metadata::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -1154,7 +1154,7 @@ void Metadata::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-Metadata::Pointer Metadata::GetValid(CCStr file, int32_t line) const
+Metadata::Pointer Metadata::GetValid(const SQChar * file, int32_t line) const
 {
     Validate(file, line);
     // Validate the referenced meta-data
@@ -1207,7 +1207,7 @@ SQInteger SearchNode::Typename(HSQUIRRELVM vm)
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-void SearchNode::Validate(CCStr file, int32_t line) const
+void SearchNode::Validate(const SQChar * file, int32_t line) const
 {
     if (!m_Handle)
     {
@@ -1226,7 +1226,7 @@ void SearchNode::Validate() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-SearchNode::Reference SearchNode::GetValid(CCStr file, int32_t line)
+SearchNode::Reference SearchNode::GetValid(const SQChar * file, int32_t line)
 {
     Validate(file, line);
     return m_Node;
diff --git a/module/Library/MMDB.hpp b/module/Library/MMDB.hpp
index 2a134159..18226817 100644
--- a/module/Library/MMDB.hpp
+++ b/module/Library/MMDB.hpp
@@ -112,7 +112,7 @@ protected:
      * Validate the managed sockaddr pointer and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -121,7 +121,7 @@ protected:
      * Validate the managed sockaddr pointer and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Pointer GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD Pointer GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD Pointer GetValid() const;
 #endif // _DEBUG
@@ -314,7 +314,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif //
@@ -323,7 +323,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const DbRef & GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD const DbRef & GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD const DbRef & GetValid() const;
 #endif // _DEBUG
@@ -502,7 +502,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -511,7 +511,7 @@ protected:
      * Validate the managed database handle and description pointer and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Pointer GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD Pointer GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD Pointer GetValid() const;
 #endif // _DEBUG
@@ -646,7 +646,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -655,7 +655,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD ConstRef GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD ConstRef GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD ConstRef GetValid() const;
 #endif // _DEBUG
@@ -857,7 +857,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -866,7 +866,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Pointer GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD Pointer GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD Pointer GetValid() const;
 #endif // _DEBUG
@@ -875,7 +875,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Pointer GetValidElem(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD Pointer GetValidElem(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD Pointer GetValidElem() const;
 #endif // _DEBUG
@@ -1164,7 +1164,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -1173,7 +1173,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const DbRef & GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD const DbRef & GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD const DbRef & GetValid() const;
 #endif // _DEBUG
@@ -1316,7 +1316,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -1325,7 +1325,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Pointer GetValid(CCStr file, int32_t line) const;
+    SQMOD_NODISCARD Pointer GetValid(const SQChar * file, int32_t line) const;
 #else
     SQMOD_NODISCARD Pointer GetValid() const;
 #endif // _DEBUG
@@ -1563,7 +1563,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    void Validate(CCStr file, int32_t line) const;
+    void Validate(const SQChar * file, int32_t line) const;
 #else
     void Validate() const;
 #endif // _DEBUG
@@ -1572,7 +1572,7 @@ protected:
      * Validate the managed database handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD Reference GetValid(CCStr file, int32_t line);
+    SQMOD_NODISCARD Reference GetValid(const SQChar * file, int32_t line);
 #else
     SQMOD_NODISCARD Reference GetValid();
 #endif // _DEBUG