diff --git a/pynestml/codegeneration/resources_nest/point_neuron/common/SynapseHeader.h.jinja2 b/pynestml/codegeneration/resources_nest/point_neuron/common/SynapseHeader.h.jinja2
index f7e26a222..81bd92daf 100644
--- a/pynestml/codegeneration/resources_nest/point_neuron/common/SynapseHeader.h.jinja2
+++ b/pynestml/codegeneration/resources_nest/point_neuron/common/SynapseHeader.h.jinja2
@@ -54,7 +54,6 @@ along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 #include "connection.h"
 #include "connector_model.h"
 #include "event.h"
-#include "nest_impl.h"
 {%- if norm_rng %}
 
 // Includes for random number generator
@@ -221,12 +220,6 @@ public:
 {%- endif %}
 };
 
-void
-register_{{ synapseName }}( const std::string& name )
-{
-  nest::register_connection_model< {{ synapseName }} >( name );
-}
-
 template < typename targetidentifierT >
 class {{synapseName}} : public Connection< targetidentifierT >
 {
@@ -662,10 +655,10 @@ public:
   }
 
 {%- if not (nest_version.startswith("v2") or nest_version.startswith("v3.0") or nest_version.startswith("v3.1") or nest_version.startswith("v3.2") or nest_version.startswith("v3.3") or nest_version.startswith("v3.4")) %}
-  void
+  bool
   send( Event& e, const size_t tid, const {{synapseName}}CommonSynapseProperties& cp )
 {%- else %}
-  void
+  bool
   send( Event& e, const thread tid, const {{synapseName}}CommonSynapseProperties& cp )
 {%- endif %}
   {
@@ -853,6 +846,7 @@ public:
     **/
 
     t_lastspike_ = __t_spike;
+    return true;
   }
 
   void get_status( DictionaryDatum& d ) const;
@@ -868,6 +862,12 @@ public:
 {%- endif %}
 };
 
+void
+register_{{ synapseName }}( const std::string& name )
+{
+  nest::register_connection_model< {{ synapseName }} >( name );
+}
+
 {%- if not (nest_version.startswith("v2") or nest_version.startswith("v3.0") or nest_version.startswith("v3.1") or nest_version.startswith("v3.2") or nest_version.startswith("v3.3") or nest_version.startswith("v3.4")) %}
 template < typename targetidentifierT >
 constexpr ConnectionModelProperties {{synapseName}}< targetidentifierT >::properties;
diff --git a/pynestml/codegeneration/resources_nest/point_neuron/setup/@MODULE_NAME@.cpp.jinja2 b/pynestml/codegeneration/resources_nest/point_neuron/setup/@MODULE_NAME@.cpp.jinja2
index 8a12a6070..d31bdc0cd 100644
--- a/pynestml/codegeneration/resources_nest/point_neuron/setup/@MODULE_NAME@.cpp.jinja2
+++ b/pynestml/codegeneration/resources_nest/point_neuron/setup/@MODULE_NAME@.cpp.jinja2
@@ -132,7 +132,7 @@ void
 
     // register synapses
 {%-   for synapse in synapses %}
-    register_{{synapse.get_name()}}( "{{synapse.get_name()}}" );
+    nest::register_{{synapse.get_name()}}( "{{synapse.get_name()}}" );
 {%-   endfor %}
 {%- endif %}
 } // {{moduleName}}::init()