diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java
index 95d2e6821271..e06e58721918 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java
@@ -92,7 +92,7 @@ public final class JavaReflectionReferenceContributor extends PsiReferenceContri
     }
 
     @Override
-    public PsiReference @NotNull [] getReferencesByString(String str, @NotNull PsiElement position, int offsetInPosition) {
+    public PsiReference @NotNull [] getReferencesByString(@NotNull String str, @NotNull PsiElement position, int offsetInPosition) {
       if (StringUtil.isEmpty(str)) {
         return PsiReference.EMPTY_ARRAY;
       }
diff --git a/java/manifest/src/org/jetbrains/lang/manifest/header/impl/ClassReferenceParser.java b/java/manifest/src/org/jetbrains/lang/manifest/header/impl/ClassReferenceParser.java
index e54dab17847a..0b3ebfc9481d 100644
--- a/java/manifest/src/org/jetbrains/lang/manifest/header/impl/ClassReferenceParser.java
+++ b/java/manifest/src/org/jetbrains/lang/manifest/header/impl/ClassReferenceParser.java
@@ -36,7 +36,7 @@ public class ClassReferenceParser extends StandardHeaderParser {
     if (module != null) {
       provider = new JavaClassReferenceProvider() {
         @Override
-        public GlobalSearchScope getScope(Project project) {
+        public GlobalSearchScope getScope(@NotNull Project project) {
           return GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module);
         }
       };
diff --git a/platform/core-api/src/com/intellij/psi/ResolvingHint.java b/platform/core-api/src/com/intellij/psi/ResolvingHint.java
index 30a98c172232..fe6a969cda0d 100644
--- a/platform/core-api/src/com/intellij/psi/ResolvingHint.java
+++ b/platform/core-api/src/com/intellij/psi/ResolvingHint.java
@@ -16,6 +16,8 @@
 
 package com.intellij.psi;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * CAUTION: this is a workaround to fix java method searcher performance.
  * This can be removed in future if the searcher is fixed to obey {@link PsiReference#isReferenceTo(PsiElement)} contract.
@@ -25,5 +27,5 @@ package com.intellij.psi;
  */
 public interface ResolvingHint {
 
-  boolean canResolveTo(Class<? extends PsiElement> elementClass);
+  boolean canResolveTo(@NotNull Class<? extends PsiElement> elementClass);
 }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java
index 14739a675f7f..49ff79aaceae 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java
@@ -129,7 +129,7 @@ public final class FxmlReferencesContributor extends PsiReferenceContributor {
     }
 
     @Override
-    public PsiReference @NotNull [] getReferencesByString(String str,
+    public PsiReference @NotNull [] getReferencesByString(@NotNull String str,
                                                           final @NotNull PsiElement position,
                                                           int offsetInPosition) {
       if (str.length() == 0) return PsiReference.EMPTY_ARRAY;
diff --git a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
index ba55c3a672e7..2f077a266ca4 100644
--- a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
+++ b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
@@ -43,7 +43,7 @@ public class ResourceBundleReference extends PsiReferenceBase<PsiElement>
   }
 
   @Override
-  public boolean canResolveTo(Class<? extends PsiElement> elementClass) {
+  public boolean canResolveTo(@NotNull Class<? extends PsiElement> elementClass) {
     return ReflectionUtil.isAssignable(PsiFile.class, elementClass);
   }
 
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java
index ef64f3d1a902..c325a04d02f9 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/ResolvingConverter.java
@@ -95,7 +95,7 @@ public abstract class ResolvingConverter<T> extends Converter<T> implements Reso
   }
 
   @Override
-  public boolean canResolveTo(Class<? extends PsiElement> elementClass) {
+  public boolean canResolveTo(@NotNull Class<? extends PsiElement> elementClass) {
     return true;
   }
 
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java
index 76262517104b..e5247e0e163e 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java
@@ -51,7 +51,7 @@ public class SchemaPrefixReference extends PsiReferenceBase<XmlElement> implemen
   }
 
   @Override
-  public boolean canResolveTo(Class<? extends PsiElement> elementClass) {
+  public boolean canResolveTo(@NotNull Class<? extends PsiElement> elementClass) {
     return ReflectionUtil.isAssignable(XmlElement.class, elementClass);
   }
 
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlEnumeratedValueReference.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlEnumeratedValueReference.java
index ae265eeade82..c9714f416268 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlEnumeratedValueReference.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlEnumeratedValueReference.java
@@ -33,7 +33,7 @@ public class XmlEnumeratedValueReference extends PsiReferenceBase<XmlElement> im
   }
 
   @Override
-  public boolean canResolveTo(Class<? extends PsiElement> elementClass) {
+  public boolean canResolveTo(@NotNull Class<? extends PsiElement> elementClass) {
     return ReflectionUtil.isAssignable(XmlElement.class, elementClass);
   }