diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj b/build/kvazaar_lib/kvazaar_lib.vcxproj
index f1222bad..359601df 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj
@@ -129,7 +129,7 @@
     <ClCompile Include="..\..\src\kvazaar.c" />
     <ClCompile Include="..\..\src\bitstream.c" />
     <ClCompile Include="..\..\src\cabac.c" />
-    <ClCompile Include="..\..\src\config.c" />
+    <ClCompile Include="..\..\src\cfg.c" />
     <ClCompile Include="..\..\src\context.c" />
     <ClCompile Include="..\..\src\cu.c" />
     <ClCompile Include="..\..\src\encoder.c" />
@@ -224,7 +224,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\src\bitstream.h" />
     <ClInclude Include="..\..\src\cabac.h" />
-    <ClInclude Include="..\..\src\config.h" />
+    <ClInclude Include="..\..\src\cfg.h" />
     <ClInclude Include="..\..\src\context.h" />
     <ClInclude Include="..\..\src\encoder.h" />
     <ClInclude Include="..\..\src\encoderstate.h" />
@@ -278,4 +278,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\yasm\vsyasm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
index cbe9d13c..50e71376 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
@@ -144,7 +144,7 @@
     <ClCompile Include="..\..\src\bitstream.c">
       <Filter>CABAC</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\config.c">
+    <ClCompile Include="..\..\src\cfg.c">
       <Filter>Control</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\filter.c">
@@ -218,7 +218,7 @@
     <ClInclude Include="..\..\src\context.h">
       <Filter>CABAC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\config.h">
+    <ClInclude Include="..\..\src\cfg.h">
       <Filter>Control</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\encoder.h">
@@ -394,4 +394,4 @@
       <Filter>Optimization\strategies\x86_asm</Filter>
     </YASM>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Makefile.am b/src/Makefile.am
index ddf9440c..9d3bc609 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,8 +39,8 @@ libkvazaar_la_SOURCES = \
 	cabac.h \
 	checkpoint.c \
 	checkpoint.h \
-	config.c \
-	config.h \
+	cfg.c \
+	cfg.h \
 	context.c \
 	context.h \
 	cu.c \
diff --git a/src/config.c b/src/cfg.c
similarity index 99%
rename from src/config.c
rename to src/cfg.c
index a1965833..30200e6f 100644
--- a/src/config.c
+++ b/src/cfg.c
@@ -18,7 +18,7 @@
  * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include "config.h"
+#include "cfg.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/config.h b/src/cfg.h
similarity index 100%
rename from src/config.h
rename to src/cfg.h
diff --git a/src/context.c b/src/context.c
index 2056daca..f40eb3db 100644
--- a/src/context.c
+++ b/src/context.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "encoder.h"
 
 
diff --git a/src/encoder.c b/src/encoder.c
index f104f864..20938d12 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "tables.h"
-#include "config.h"
+#include "cfg.h"
 #include "cabac.h"
 #include "image.h"
 #include "nal.h"
diff --git a/src/encoder.h b/src/encoder.h
index e684ecc6..75877280 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -31,7 +31,6 @@
 #include "image.h"
 #include "bitstream.h"
 #include "cabac.h"
-#include "config.h"
 #include "tables.h"
 #include "scalinglist.h"
 #include "threadqueue.h"
diff --git a/src/encoderstate.c b/src/encoderstate.c
index 77b4424c..5a8afab7 100644
--- a/src/encoderstate.c
+++ b/src/encoderstate.c
@@ -26,7 +26,6 @@
 #include <assert.h>
 
 #include "tables.h"
-#include "config.h"
 #include "cabac.h"
 #include "image.h"
 #include "nal.h"
diff --git a/src/encoderstate.h b/src/encoderstate.h
index 3226d464..8a4c4796 100644
--- a/src/encoderstate.h
+++ b/src/encoderstate.h
@@ -33,7 +33,6 @@
 #include "image.h"
 #include "bitstream.h"
 #include "cabac.h"
-#include "config.h"
 #include "tables.h"
 #include "scalinglist.h"
 #include "threadqueue.h"
diff --git a/src/filter.c b/src/filter.c
index 54a88f7d..d2671deb 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "bitstream.h"
 #include "videoframe.h"
 #include "cabac.h"
diff --git a/src/inter.c b/src/inter.c
index d7107536..b913a7ad 100644
--- a/src/inter.c
+++ b/src/inter.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "filter.h"
 #include "strategies/strategies-ipol.h"
 #include "strategies/generic/ipol-generic.h"
diff --git a/src/kvazaar.c b/src/kvazaar.c
index aba343e4..c45b9e98 100644
--- a/src/kvazaar.c
+++ b/src/kvazaar.c
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-#include "config.h"
+#include "cfg.h"
 #include "encoder.h"
 #include "strategyselector.h"
 #include "encoderstate.h"
diff --git a/src/nal.c b/src/nal.c
index e540a2b3..ed538d85 100644
--- a/src/nal.c
+++ b/src/nal.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "config.h"
 #include "bitstream.h"
 #include "cabac.h"
 #include "encoder.h"
diff --git a/src/transform.c b/src/transform.c
index a417e3de..fd35e3b2 100644
--- a/src/transform.c
+++ b/src/transform.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "config.h"
 #include "nal.h"
 #include "rdo.h"
 #include "strategies/strategies-dct.h"