diff --git a/examples/udr/UdrCppExample.h b/examples/udr/UdrCppExample.h
index f2a77ff069..3ed3d779d0 100644
--- a/examples/udr/UdrCppExample.h
+++ b/examples/udr/UdrCppExample.h
@@ -79,7 +79,7 @@ namespace
 	class AutoImpl
 	{
 	public:
-		AutoImpl<T, Clear>(T* aPtr = NULL)
+		AutoImpl(T* aPtr = NULL)
 			: ptr(aPtr)
 		{
 		}
@@ -139,7 +139,7 @@ namespace
 
 	private:
 		// not implemented
-		AutoImpl<T, Clear>(AutoImpl<T, Clear>&);
+		AutoImpl(AutoImpl<T, Clear>&);
 		void operator =(AutoImpl<T, Clear>&);
 
 	private:
diff --git a/src/auth/SecureRemotePassword/server/SrpServer.cpp b/src/auth/SecureRemotePassword/server/SrpServer.cpp
index 3aafc985c3..2825da2e14 100644
--- a/src/auth/SecureRemotePassword/server/SrpServer.cpp
+++ b/src/auth/SecureRemotePassword/server/SrpServer.cpp
@@ -247,7 +247,7 @@ private:
 template <class SHA> class SrpServerImpl final : public SrpServer
 {
 public:
-	explicit SrpServerImpl<SHA>(IPluginConfig* ipc)
+	explicit SrpServerImpl(IPluginConfig* ipc)
 		: SrpServer(ipc)
 	{}
 
diff --git a/src/common/classes/Nullable.h b/src/common/classes/Nullable.h
index 26502231f4..5715140602 100644
--- a/src/common/classes/Nullable.h
+++ b/src/common/classes/Nullable.h
@@ -123,19 +123,15 @@ public:
 template <typename T> class Nullable : public BaseNullable<T>
 {
 public:
-	explicit Nullable<T>(const T& v)
+	explicit Nullable(const T& v)
 	{
 		this->value = v;
 		this->specified = true;
 	}
 
-	Nullable<T>(const Nullable<T>& o) = default;
-/*	{
-		this->value = o.value;
-		this->specified = o.specified;
-	}
-*/
-	Nullable<T>()
+	Nullable(const Nullable<T>& o) = default;
+
+	Nullable()
 	{
 		invalidate();
 	}
diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
index 372fb16877..f3fc8f23e9 100644
--- a/src/common/classes/alloc.h
+++ b/src/common/classes/alloc.h
@@ -341,7 +341,7 @@ template <typename SubsystemThreadData, typename SubsystemPool>
 class SubsystemContextPoolHolder : public ContextPoolHolder
 {
 public:
-	SubsystemContextPoolHolder <SubsystemThreadData, SubsystemPool>
+	SubsystemContextPoolHolder
 	(
 		SubsystemThreadData* subThreadData,
 		SubsystemPool* newPool
diff --git a/src/common/classes/stack.h b/src/common/classes/stack.h
index fa15d4bff5..c4a8d2850a 100644
--- a/src/common/classes/stack.h
+++ b/src/common/classes/stack.h
@@ -36,7 +36,7 @@ namespace Firebird {
 		class Stack : public AutoStorage
 	{
 	private:
-		Stack<Object, Capacity>(Stack<Object, Capacity>&);	// not implemented
+		Stack(Stack<Object, Capacity>&);	// not implemented
 
 		class Entry : public Vector<Object, Capacity>
 		{
@@ -117,11 +117,11 @@ namespace Firebird {
 		Entry* stk_cache;
 
 	public:
-		explicit Stack<Object, Capacity>(MemoryPool& p)
+		explicit Stack(MemoryPool& p)
 			: AutoStorage(p), stk(0), stk_cache(0)
 		{ }
 
-		Stack<Object, Capacity>() : AutoStorage(), stk(0), stk_cache(0) { }
+		Stack() : AutoStorage(), stk(0), stk_cache(0) { }
 
 		~Stack()
 		{