diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8c27fee..7ef22955 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # FluidSynth - A Software Synthesizer
 #
-# Copyright (C) 2003-2011 Peter Hanappe and others.
+# Copyright (C) 2003-2021 Peter Hanappe and others.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public License
@@ -29,7 +29,7 @@ set ( PACKAGE "fluidsynth" )
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 2 )
 set ( FLUIDSYNTH_VERSION_MINOR 1 )
-set ( FLUIDSYNTH_VERSION_MICRO 7 )
+set ( FLUIDSYNTH_VERSION_MICRO 8 )
 set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
 set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 
diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt
index acf98eda..56a941e6 100644
--- a/doc/fluidsynth-v20-devdoc.txt
+++ b/doc/fluidsynth-v20-devdoc.txt
@@ -8,8 +8,8 @@
 \author David Henningsson
 \author Tom Moebert
 \author Copyright © 2003-2021 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert
-\version Revision 2.1.7
-\date 2021-01-29
+\version Revision 2.1.8
+\date 2021-03-13
 
 All the source code examples in this document are in the public domain; you can use them as you please. This document is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/3.0/ . The FluidSynth library is distributed under the GNU Lesser General Public License. A copy of the GNU Lesser General Public License is contained in the FluidSynth package; if not, visit https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
diff --git a/src/gentables/make_tables.c b/src/gentables/make_tables.c
index b1e4dbb2..3aee11b6 100644
--- a/src/gentables/make_tables.c
+++ b/src/gentables/make_tables.c
@@ -72,11 +72,11 @@ int main (int argc, char *argv[])
     if (argc < 2)
         return -1;
     
-    open_table(&fp, argv[1], "fluid_conv_tables.c");
+    open_table(&fp, argv[1], "fluid_conv_tables.inc.h");
     gen_conv_table(fp);
     fclose(fp);
 
-    open_table(&fp, argv[1], "fluid_rvoice_dsp_tables.c");
+    open_table(&fp, argv[1], "fluid_rvoice_dsp_tables.inc.h");
     gen_rvoice_table_dsp(fp);
     fclose(fp);
 
diff --git a/src/rvoice/fluid_rvoice_dsp.c b/src/rvoice/fluid_rvoice_dsp.c
index aec79aab..b43a0f19 100644
--- a/src/rvoice/fluid_rvoice_dsp.c
+++ b/src/rvoice/fluid_rvoice_dsp.c
@@ -21,7 +21,7 @@
 #include "fluid_sys.h"
 #include "fluid_phase.h"
 #include "fluid_rvoice.h"
-#include "fluid_rvoice_dsp_tables.c"
+#include "fluid_rvoice_dsp_tables.inc.h"
 
 /* Purpose:
  *
diff --git a/src/utils/fluid_conv.c b/src/utils/fluid_conv.c
index 5c055d2b..65dcde30 100644
--- a/src/utils/fluid_conv.c
+++ b/src/utils/fluid_conv.c
@@ -20,7 +20,7 @@
 
 #include "fluid_conv.h"
 #include "fluid_sys.h"
-#include "fluid_conv_tables.c"
+#include "fluid_conv_tables.inc.h"
 
 /*
  * Converts absolute cents to Hertz