diff --git a/docs/source/eFeatures.rst b/docs/source/eFeatures.rst
index 521b0f1b..ff2bd141 100644
--- a/docs/source/eFeatures.rst
+++ b/docs/source/eFeatures.rst
@@ -2027,96 +2027,6 @@ Difference between maximum voltage during stimulus and voltage base
     maximum_voltage_from_voltagebase = maximum_voltage - voltage_base
 
 
-
-Requested eFeatures
-===================
-
-Cpp features
-------------
-
-AHP_depth_last
-~~~~~~~~~~~~~~
-
-Relative voltage values at the last after-hyperpolarization
-
-- **Required features**: voltage_base (mV), last_AHP_values (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    last_AHP_values = last_min_element(voltage, peak_indices)
-    AHP_depth = last_AHP_values[:] - voltage_base
-
-
-AHP_time_from_peak_last
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Time between AP peaks and last AHP depths
-
-- **Required features**: peak_indices, min_AHP_values (mV)
-- **Units**: ms
-- **Pseudocode**: ::
-
-    last_AHP_indices = last_min_element(voltage, peak_indices)
-    AHP_time_from_peak_last = t[last_AHP_indices[:]] - t[peak_indices[i]]
-
-
-steady_state_voltage_stimend_from_voltage_base
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The average voltage during the last 90% of the stimulus duration realtive to voltage_base
-
-- **Required features**: steady_state_voltage_stimend (mV), voltage_base (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    steady_state_voltage_stimend_from_voltage_base = steady_state_voltage_stimend - voltage_base
-
-
-min_duringstim_from_voltage_base
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The minimum voltage during stimulus
-
-- **Required features**: min_duringstim (mV), voltage_base (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    min_duringstim_from_voltage_base = minimum_voltage - voltage_base
-
-
-max_duringstim_from_voltage_base
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The minimum voltage during stimulus
-
-- **Required features**: max_duringstim (mV), voltage_base (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    max_duringstim_from_voltage_base = maximum_voltage - voltage_base
-
-diff_max_duringstim
-~~~~~~~~~~~~~~~~~~~
-
-Difference between maximum and steady state during stimulation
-
-- **Required features**: max_duringstim (mV), steady_state_voltage_stimend (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    diff_max_duringstim: max_duringstim - steady_state_voltage_stimend
-
-diff_min_duringstim
-~~~~~~~~~~~~~~~~~~~
-
-Difference between minimum and steady state during stimulation
-
-- **Required features**: min_duringstim (mV), steady_state_voltage_stimend (mV)
-- **Units**: mV
-- **Pseudocode**: ::
-
-    diff_min_duringstim: min_duringstim - steady_state_voltage_stimend
-
 Python features
 ---------------
 
diff --git a/efel/cppcore/BasicFeatures.cpp b/efel/cppcore/BasicFeatures.cpp
index ad185c67..f61dc171 100644
--- a/efel/cppcore/BasicFeatures.cpp
+++ b/efel/cppcore/BasicFeatures.cpp
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.                   
  */
 
+#include "BasicFeatures.h"
+
 
 int BasicFeatures::interpolate(mapStr2intVec& IntFeatureData,
                        mapStr2doubleVec& DoubleFeatureData,
diff --git a/efel/cppcore/SpikeEvent.cpp b/efel/cppcore/SpikeEvent.cpp
index 5b843009..2a6764d8 100644
--- a/efel/cppcore/SpikeEvent.cpp
+++ b/efel/cppcore/SpikeEvent.cpp
@@ -17,6 +17,8 @@
  */
 
 
+#include "SpikeEvent.h"
+
 #include <math.h>
 
 #include <algorithm>
diff --git a/efel/cppcore/SpikeEvent.h b/efel/cppcore/SpikeEvent.h
index 70f535a0..1dc9adce 100644
--- a/efel/cppcore/SpikeEvent.h
+++ b/efel/cppcore/SpikeEvent.h
@@ -91,7 +91,6 @@ int time_to_interburst_min(mapStr2intVec& IntFeatureData,
 int postburst_slow_ahp_indices(mapStr2intVec& IntFeatureData,
                                mapStr2doubleVec& DoubleFeatureData,
                                mapStr2Str& StringData);
-
 int postburst_slow_ahp_values(mapStr2intVec& IntFeatureData,
                               mapStr2doubleVec& DoubleFeatureData,
                               mapStr2Str& StringData);
diff --git a/efel/cppcore/SpikeShape.cpp b/efel/cppcore/SpikeShape.cpp
index 89b27af0..cbf0aad8 100644
--- a/efel/cppcore/SpikeShape.cpp
+++ b/efel/cppcore/SpikeShape.cpp
@@ -17,6 +17,8 @@
  */
 
 
+#include "SpikeShape.h"
+
 #include <math.h>
 
 #include <algorithm>
diff --git a/efel/cppcore/SpikeShape.h b/efel/cppcore/SpikeShape.h
index 17a21733..fe906088 100644
--- a/efel/cppcore/SpikeShape.h
+++ b/efel/cppcore/SpikeShape.h
@@ -39,7 +39,7 @@ int AP1_amp(mapStr2intVec& IntFeatureData,
             mapStr2Str& StringData);
 int AP2_amp(mapStr2intVec& IntFeatureData,
             mapStr2doubleVec& DoubleFeatureData,
-            mapStr2Str& StringData)
+            mapStr2Str& StringData);
 int mean_AP_amplitude(mapStr2intVec& IntFeatureData,
                       mapStr2doubleVec& DoubleFeatureData,
                       mapStr2Str& StringData);
diff --git a/efel/cppcore/Subthreshold.cpp b/efel/cppcore/Subthreshold.cpp
index 0e18e1f1..bbeff88f 100644
--- a/efel/cppcore/Subthreshold.cpp
+++ b/efel/cppcore/Subthreshold.cpp
@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.                   
  */
 
+#include "Subthreshold.h"
 
 #include <math.h>