diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
index 9f974268e8..3e4e5d0b17 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
index 96d98217e1..d5f1a9c62e 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
+using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
index 8d3a6af9f7..1a0a6437ee 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
index 589a4d912f..f05f102331 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
+using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs
index a9dad8a82d..bfd5cb9986 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserServiceExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.StaticFiles;
 using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.Framework.DependencyInjection
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
index 250fa60d6d..4130fa4d36 100644
--- a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/NotNullAttribute.cs b/src/Microsoft.AspNet.StaticFiles/NotNullAttribute.cs
deleted file mode 100644
index bc879f17b6..0000000000
--- a/src/Microsoft.AspNet.StaticFiles/NotNullAttribute.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNet.StaticFiles
-{
-    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
-    internal sealed class NotNullAttribute : Attribute
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
index 5ec72f4c68..0c2546bb61 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Builder;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.StaticFiles
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
index 5b1d1dfe91..0a790f6cab 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
+using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
index b8fcfc2d4f..ed51faf137 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
index 7b5947cf44..8ed46b5eeb 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
+using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/project.json b/src/Microsoft.AspNet.StaticFiles/project.json
index fd8a2cd524..fe1b185146 100644
--- a/src/Microsoft.AspNet.StaticFiles/project.json
+++ b/src/Microsoft.AspNet.StaticFiles/project.json
@@ -7,6 +7,7 @@
         "Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*",
         "Microsoft.AspNet.Hosting.Interfaces": "1.0.0-*",
         "Microsoft.Framework.Logging": "1.0.0-*",
+        "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" },
         "Microsoft.Framework.WebEncoders": "1.0.0-*"
     },
     "frameworks": {