diff --git a/setup.py b/setup.py
index f2adf3e05d..8be94cc9d6 100755
--- a/setup.py
+++ b/setup.py
@@ -77,19 +77,19 @@
 
 # Define extensions
 EXTS = []
-for modulename, other_sources in (
-    ('dipy.reconst.recspeed', []),
-    ('dipy.reconst.vec_val_sum', []),
-    ('dipy.reconst.quick_squash', []),
-    ('dipy.tracking.distances', []),
-    ('dipy.core.streamlinespeed', []),
-    ('dipy.tracking.vox2track', []),
-    ('dipy.tracking.propspeed', []),
-    ('dipy.denoise.denspeed', [])
+for modulename, other_sources, language in (
+    ('dipy.reconst.recspeed', [], 'c'),
+    ('dipy.reconst.vec_val_sum', [], 'c'),
+    ('dipy.reconst.quick_squash', [], 'c'),
+    ('dipy.tracking.distances', [], 'c'),
+    ('dipy.core.streamlinespeed', [], 'c++'),
+    ('dipy.tracking.vox2track', [], 'c'),
+    ('dipy.tracking.propspeed', [], 'c'),
+    ('dipy.denoise.denspeed', [], 'c')
     ):
     pyx_src = pjoin(*modulename.split('.')) + '.pyx'
     EXTS.append(Extension(modulename,[pyx_src] + other_sources,
-                          language = "c++",
+                          language = language,
                           include_dirs = [np.get_include(), "src"]))