diff --git a/carray/Makefile b/carray/Makefile
index c0cff87e..043053fa 100644
--- a/carray/Makefile
+++ b/carray/Makefile
@@ -4,10 +4,14 @@ include ../build-aux/version.mak
 include ../build-aux/dirs.mak
 
 OPTLEVEL?=$(DEFAULT_OPTLEVEL)
-CXXFLAGS?=$(OPTLEVEL)
+CFLAGS?=$(OPTLEVEL)
 
 CPPFLAGS:=$(CPPFLAGS) -DVERSIONSTR=\"$(VERSION)\"
-CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti
+CFLAGS:=$(CFLAGS) -Wall -Wextra
+
+ifeq ($(HOST_IS_SORTIX),0)
+  CPPFLAGS+=-D_GNU_SOURCE
+endif
 
 BINARY:=carray
 
@@ -19,8 +23,8 @@ install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
 	install $(BINARY) $(DESTDIR)$(BINDIR)
 
-%: %.c++
-	$(CXX) -std=gnu++11 $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+%: %.c
+	$(CC) -std=gnu11 $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 clean:
 	rm -f $(BINARY) *.o
diff --git a/carray/carray.c++ b/carray/carray.c
similarity index 99%
rename from carray/carray.c++
rename to carray/carray.c
index e3c73ec6..b37dd198 100644
--- a/carray/carray.c++
+++ b/carray/carray.c
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License along with
     this program. If not, see <http://www.gnu.org/licenses/>.
 
-    carray.c++
+    carray.c
     Convert a binary file to a C array.
 
 *******************************************************************************/
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <error.h>
 #include <locale.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -159,7 +160,8 @@ int main(int argc, char* argv[])
 			break;
 		if ( arg[1] != '-' )
 		{
-			while ( char c = *++arg ) switch ( c )
+			char c;
+			while ( (c = *++arg) ) switch ( c )
 			{
 			case 'c': flag_const = true; break;
 			case 'e': flag_extern = true; break;