diff --git a/cy_setup.py b/cy_setup.py
index 858e4479..2f73eb1f 100644
--- a/cy_setup.py
+++ b/cy_setup.py
@@ -19,13 +19,13 @@ def build_for_architecture(arch):
 
     # Base compiler flags for all platforms
     compiler_flags = {
-        'Windows': ['/O2'],
-        'Darwin': ['-O3'],  # macOS
-        'Linux': ['-O3']
+        'Windows': ['/O2', '/std:c++17'],  # MSVC flags
+        'Darwin': ['-O3', '-std=c++17'],   # macOS/Clang flags
+        'Linux': ['-O3', '-std=c++17']     # Linux/GCC flags
     }
 
     # Get base optimization flag for current platform
-    extra_compile_args = compiler_flags.get(platform.system(), ['-O3'])
+    extra_compile_args = compiler_flags.get(platform.system(), ['-O3', '-std=c++17'])
     extra_link_args = []
 
     # Add architecture flags only for macOS
diff --git a/retopoflow/cy/accel2d.pxd b/retopoflow/cy/accel2d.pxd
index 4b73f3a9..c0f29992 100644
--- a/retopoflow/cy/accel2d.pxd
+++ b/retopoflow/cy/accel2d.pxd
@@ -1,5 +1,4 @@
 # distutils: language=c++
-# distutils: extra_compile_args=/std:c++17
 # cython: language_level=3
 
 from libc.stdint cimport uint8_t
diff --git a/retopoflow/cy/accel2d.pyx b/retopoflow/cy/accel2d.pyx
index 010189a5..000d4e15 100644
--- a/retopoflow/cy/accel2d.pyx
+++ b/retopoflow/cy/accel2d.pyx
@@ -1,5 +1,4 @@
 # distutils: language=c++
-# distutils: extra_compile_args=/std:c++17
 # cython: language_level=3
 # cython: boundscheck=False
 # cython: wraparound=False
diff --git a/retopoflow/cy/bmesh_enums.pxd b/retopoflow/cy/bmesh_enums.pxd
index 48509f3f..0c583423 100644
--- a/retopoflow/cy/bmesh_enums.pxd
+++ b/retopoflow/cy/bmesh_enums.pxd
@@ -1,5 +1,4 @@
 # distutils: language=c++
-# distutils: extra_compile_args=/std:c++17
 # cython: language_level=3
 # cython: boundscheck=False
 # cython: wraparound=False