diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java
index a22cc9c15ba..17c48840337 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Anton Gorenkov  - initial implementation
  *     Marc-Andre Laperle
+ *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.codan.internal.checkers;
 
@@ -44,6 +45,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
+import org.eclipse.cdt.core.dom.ast.cpp.SemanticQueries;
 import org.eclipse.cdt.core.index.IIndex;
 import org.eclipse.cdt.core.index.IIndexBinding;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper;
@@ -254,16 +256,19 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker {
 				IBinding binding = functionDefinition.getDeclarator().getName().resolveBinding();
 				if (binding instanceof ICPPConstructor) {
 					ICPPConstructor constructor = (ICPPConstructor) binding;
-					if (constructor.getClassOwner().getKey() != ICompositeType.k_union) {
-						return constructor;
-					}
+					// Skip defaulted copy and move constructors.
+					if (functionDefinition.isDefaulted() && SemanticQueries.isCopyOrMoveConstructor(constructor))
+						return null;
+					if (constructor.getClassOwner().getKey() == ICompositeType.k_union)
+						return null;
+					return constructor;
 				}
 			}
 			
 			return null;
 		}
 	}
-	
+
 	@Override
 	public void initPreferences(IProblemWorkingCopy problem) {
 		super.initPreferences(problem);
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
index ed41608005c..e318918b84c 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Anton Gorenkov   - initial implementation
  *     Marc-Andre Laperle
+ *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.codan.core.internal.checkers;
 
@@ -578,12 +579,27 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase {
 		checkNoErrors();
 	}
 
-	//  struct S {
-	//      int i;
-	//      S() = default;
-	//  };
-	public void testBug365498_defaultedConstructor() throws Exception{
+	//	struct S {
+	//	    int i;
+	//	    S() = default;
+	//	};
+	public void testBug365498_defaultedConstructor() throws Exception {
 		loadCodeAndRun(getAboveComment());
 		checkErrorLine(3);
 	}
+
+	//	struct S {
+	//	    S(S&) = default;
+	//	    S(const S&) = default;
+	//	    S(volatile S&) = default;
+	//	    S(const volatile S&) = default;
+	//	    S(S&&) = default;
+	//	    S(const S&&) = default;
+	//	    S(volatile S&&) = default;
+	//	    S(const volatile S&&) = default;
+	//	};
+	public void testBug395018_defaultedCopyOrMoveConstructor() throws Exception {
+		loadCodeAndRun(getAboveComment());
+		checkNoErrors();
+	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/SemanticQueries.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/SemanticQueries.java
new file mode 100644
index 00000000000..60fd014f6c4
--- /dev/null
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/SemanticQueries.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Nathan Ridge.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Nathan Ridge - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.dom.ast.cpp;
+
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.CVTYPE;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF;
+
+import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
+
+/**
+ * @since 5.5
+ */
+public class SemanticQueries {
+
+	public static boolean isCopyOrMoveConstructor(ICPPConstructor constructor) {
+		return isCopyOrMoveConstructor(constructor, CopyOrMoveConstructorKind.COPY_OR_MOVE);
+	}
+
+	public static boolean isMoveConstructor(ICPPConstructor constructor) {
+		return isCopyOrMoveConstructor(constructor, CopyOrMoveConstructorKind.MOVE);
+	}
+
+	public static boolean isCopyConstructor(ICPPConstructor constructor) {
+		return isCopyOrMoveConstructor(constructor, CopyOrMoveConstructorKind.COPY);
+	}
+
+	private enum CopyOrMoveConstructorKind { COPY, MOVE, COPY_OR_MOVE }
+
+	private static boolean isCopyOrMoveConstructor(ICPPConstructor constructor, CopyOrMoveConstructorKind kind) {
+		// 12.8/2-3 [class.copy]:
+		// "A non-template constructor for class X is a copy [move] constructor
+		//  if its first parameter is of type X&[&], const X&[&], volatile X&[&]
+		//  or const volatile X&[&], and either there are no other parametrs or
+		//  else all other parametrs have default arguments."
+		if (constructor instanceof ICPPFunctionTemplate)
+			return false;
+		if (!isCallableWithNumberOfArguments(constructor, 1))
+			return false;
+		IType firstArgumentType = constructor.getType().getParameterTypes()[0];
+		firstArgumentType = SemanticUtil.getNestedType(firstArgumentType, TDEF);
+		if (!(firstArgumentType instanceof ICPPReferenceType))
+			return false;
+		ICPPReferenceType firstArgReferenceType = (ICPPReferenceType) firstArgumentType;
+		boolean isRvalue = firstArgReferenceType.isRValueReference();
+		if (isRvalue && kind == CopyOrMoveConstructorKind.COPY)
+			return false;
+		if (!isRvalue && kind == CopyOrMoveConstructorKind.MOVE)
+			return false;
+		firstArgumentType = firstArgReferenceType.getType();
+		firstArgumentType = SemanticUtil.getNestedType(firstArgumentType, CVTYPE);
+		return firstArgumentType.isSameType(constructor.getClassOwner());
+	}
+
+	private static boolean isCallableWithNumberOfArguments(ICPPFunction function, int numArguments) {
+		return function.getParameters().length >= numArguments
+			&& function.getRequiredArgumentCount() <= numArguments;
+	}
+}