diff --git a/CMakeLists.txt b/CMakeLists.txt
index b55852194..63347318b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1812,10 +1812,10 @@ if(ENABLE_LIBZFS)
     endif()
 endif()
 if(ENABLE_WCWIDTH)
-    target_compile_definitions(libfastfetch PRIVATE FF_ENABLE_WCWIDTH=1)
+    target_compile_definitions(libfastfetch PUBLIC FF_ENABLE_WCWIDTH=1)
 endif()
 if(NOT HAVE_MEMRCHR)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_CUSTOM_MEMRCHR=1)
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_CUSTOM_MEMRCHR=1)
 endif()
 
 if(LINUX)
diff --git a/src/common/impl/wcwidth.c b/src/common/impl/wcwidth.c
index 5b4a1adc9..445351046 100644
--- a/src/common/impl/wcwidth.c
+++ b/src/common/impl/wcwidth.c
@@ -19,11 +19,11 @@ int mk_wcwidth(uint32_t wc) {
         case widechar_widened_in_9:
             // Our renderer supports Unicode 9
             return 2;
-        // case widechar_nonprint:
-        // case widechar_combining:
-        // case widechar_unassigned:
-        // case widechar_non_character:
-        //    return -1;
+        case widechar_nonprint:
+        case widechar_combining:
+        case widechar_unassigned:
+        case widechar_non_character:
+           return 0;
         default:
             // Use the width widechar_width gave us.
             return width;
diff --git a/tests/strutil.c b/tests/strutil.c
index ed3ddae03..3d065eee6 100644
--- a/tests/strutil.c
+++ b/tests/strutil.c
@@ -17,6 +17,7 @@ static void verify(bool expression, const char* expressionStr, int lineNo) {
 #define VERIFY(expression) verify((expression), #expression, __LINE__)
 
 int main(void) {
+    #if FF_ENABLE_WCWIDTH
     {
         uint8_t width = 255;
         uint8_t bytes = ffUtf8CharLenWidth("", 0, &width);
@@ -35,18 +36,16 @@ int main(void) {
         const char* ch = "\xE6\x96\x87"; // 文 U+6587
         uint8_t width = 0;
         uint8_t bytes = ffUtf8CharLenWidth(ch, 3, &width);
-        int expected = mk_wcwidth(0x6587);
         VERIFY(bytes == 3);
-        VERIFY(width == (uint8_t) (expected < 0 ? 0 : expected));
+        VERIFY(width == 2);
     }
 
     {
-        const char* combining = "\xCC\x81"; // U+0301
+        const char* combining = "\xCC\x81"; // ◌́ U+0301
         uint8_t width = 0;
         uint8_t bytes = ffUtf8CharLenWidth(combining, 2, &width);
-        int expected = mk_wcwidth(0x0301);
         VERIFY(bytes == 2);
-        VERIFY(width == (uint8_t) (expected < 0 ? 0 : expected));
+        VERIFY(width == 0); // Should be 1 since there's no base character
     }
 
     {
@@ -72,18 +71,14 @@ int main(void) {
 
     {
         const char* mixed = "A"
-                            "\xE6\x96\x87"
+                            "\xE6\x96\x87" // 文 U+6587
                             "B";
-        int wide = mk_wcwidth(0x6587);
-        uint32_t expected = 2 + (uint32_t) (wide < 0 ? 0 : wide);
-        VERIFY(ffUtf8StrWidth(mixed, 5) == expected);
+        VERIFY(ffUtf8StrWidth(mixed, 5) == 4);
     }
 
     {
-        const char* combining = "A\xCC\x81";
-        int wCombining = mk_wcwidth(0x0301);
-        uint32_t expected = 1 + (uint32_t) (wCombining < 0 ? 0 : wCombining);
-        VERIFY(ffUtf8StrWidth(combining, 3) == expected);
+        const char* combining = "A\xCC\x81"; // Á
+        VERIFY(ffUtf8StrWidth(combining, 3) == 1);
     }
 
     {
@@ -97,22 +92,17 @@ int main(void) {
         VERIFY(ffUtf8StrWidth("A\0B", 3) == 1);
     }
 
-    {
-        const char* combining = "\xCC\x81";
-        int wCombining = mk_wcwidth(0x0301);
-        uint32_t normalized = (uint32_t) (wCombining < 0 ? 0 : wCombining);
-        uint32_t expected = normalized > 0 ? normalized : 2;
-        VERIFY(ffUtf8StrWidth(combining, 2) == expected);
-    }
-
     {
         const char* emoji = "\xF0\x9F\x98\x80"; // U+1F600 😀
         uint8_t width = 0;
         uint8_t bytes = ffUtf8CharLenWidth(emoji, 4, &width);
         VERIFY(bytes == 4);
-        VERIFY(width == mk_wcwidth(0x1F600));
+        VERIFY(width == 2);
     }
 
     puts("\033[32mAll tests passed!" FASTFETCH_TEXT_MODIFIER_RESET);
+    #else
+    puts("\033[33mTests skipped because wcwidth support is disabled." FASTFETCH_TEXT_MODIFIER_RESET);
+    #endif
     return 0;
 }