diff --git a/src/ansi-c/Makefile b/src/ansi-c/Makefile
index 4cad0a3e522..d4cdbd7c44d 100644
--- a/src/ansi-c/Makefile
+++ b/src/ansi-c/Makefile
@@ -28,6 +28,7 @@ SRC = anonymous_member.cpp \
       designator.cpp \
       expr2c.cpp \
       gcc_types.cpp \
+      gcc_version.cpp \
       literals/convert_character_literal.cpp \
       literals/convert_float_literal.cpp \
       literals/convert_integer_literal.cpp \
diff --git a/src/goto-cc/gcc_version.cpp b/src/ansi-c/gcc_version.cpp
similarity index 100%
rename from src/goto-cc/gcc_version.cpp
rename to src/ansi-c/gcc_version.cpp
diff --git a/src/goto-cc/gcc_version.h b/src/ansi-c/gcc_version.h
similarity index 80%
rename from src/goto-cc/gcc_version.h
rename to src/ansi-c/gcc_version.h
index 58cd7defea5..009cc5a03f3 100644
--- a/src/goto-cc/gcc_version.h
+++ b/src/ansi-c/gcc_version.h
@@ -40,13 +40,12 @@ class gcc_versiont
   configt::cppt::cpp_standardt default_cxx_standard;
 
   gcc_versiont()
-    :
-    v_major(0),
-    v_minor(0),
-    v_patchlevel(0),
-    flavor(flavort::UNKNOWN),
-    default_c_standard(configt::ansi_ct::c_standardt::C89),
-    default_cxx_standard(configt::cppt::cpp_standardt::CPP98)
+    : v_major(0),
+      v_minor(0),
+      v_patchlevel(0),
+      flavor(flavort::UNKNOWN),
+      default_c_standard(configt::ansi_ct::c_standardt::C89),
+      default_cxx_standard(configt::cppt::cpp_standardt::CPP98)
   {
   }
 };
diff --git a/src/goto-cc/Makefile b/src/goto-cc/Makefile
index 94d1d9ead3f..db278cd7234 100644
--- a/src/goto-cc/Makefile
+++ b/src/goto-cc/Makefile
@@ -10,7 +10,6 @@ SRC = armcc_cmdline.cpp \
       gcc_cmdline.cpp \
       gcc_message_handler.cpp \
       gcc_mode.cpp \
-      gcc_version.cpp \
       goto_cc_cmdline.cpp \
       goto_cc_languages.cpp \
       goto_cc_main.cpp \
diff --git a/src/goto-cc/gcc_mode.h b/src/goto-cc/gcc_mode.h
index 702854b79e6..9550923ba85 100644
--- a/src/goto-cc/gcc_mode.h
+++ b/src/goto-cc/gcc_mode.h
@@ -16,9 +16,10 @@ Date: June 2006
 
 #include "compile.h"
 #include "gcc_message_handler.h"
-#include "gcc_version.h"
 #include "goto_cc_mode.h"
 
+#include <ansi-c/gcc_version.h>
+
 #include <set>
 
 class gcc_modet:public goto_cc_modet