diff --git a/cms/envs/common.py b/cms/envs/common.py
index d18d6d1a4f7e22d8f477166c83bd10bfc514da03..af72895c182e94894af52ebdc8c3d7456e6f9ee1 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -335,7 +335,7 @@ simplefilter('ignore')
 MIDDLEWARE_CLASSES = (
     'crum.CurrentRequestUserMiddleware',
     'request_cache.middleware.RequestCache',
-    'header_control.middleware.HeaderControlMiddleware',
+    'openedx.core.djangoapps.header_control.middleware.HeaderControlMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 325f8bf498c1acfa0297ffdd356da0962b919916..9af1416c4df2bc61e05b5dbc4b70fdc3e02cf843 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1088,7 +1088,7 @@ MIDDLEWARE_CLASSES = (
     'request_cache.middleware.RequestCache',
 
     'mobile_api.middleware.AppVersionUpgrade',
-    'header_control.middleware.HeaderControlMiddleware',
+    'openedx.core.djangoapps.header_control.middleware.HeaderControlMiddleware',
     'microsite_configuration.middleware.MicrositeMiddleware',
     'django_comment_client.middleware.AjaxExceptionMiddleware',
     'django.middleware.common.CommonMiddleware',
diff --git a/openedx/core/djangoapps/contentserver/middleware.py b/openedx/core/djangoapps/contentserver/middleware.py
index 369639702df579f30182af9264406c3e86fa5f05..9fb41c08b5915080b6344131ced5d0b8d2d9c576 100644
--- a/openedx/core/djangoapps/contentserver/middleware.py
+++ b/openedx/core/djangoapps/contentserver/middleware.py
@@ -10,12 +10,12 @@ from django.http import (
     HttpResponseBadRequest, HttpResponseNotFound, HttpResponsePermanentRedirect)
 from student.models import CourseEnrollment
 
-from header_control import force_header_for_response
 from xmodule.assetstore.assetmgr import AssetManager
 from xmodule.contentstore.content import StaticContent, XASSET_LOCATION_TAG
 from xmodule.modulestore import InvalidLocationError
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.locator import AssetLocator
+from openedx.core.djangoapps.header_control import force_header_for_response
 from .caching import get_cached_content, set_cached_content
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.exceptions import NotFoundError
diff --git a/common/djangoapps/header_control/__init__.py b/openedx/core/djangoapps/header_control/__init__.py
similarity index 100%
rename from common/djangoapps/header_control/__init__.py
rename to openedx/core/djangoapps/header_control/__init__.py
diff --git a/common/djangoapps/header_control/decorators.py b/openedx/core/djangoapps/header_control/decorators.py
similarity index 94%
rename from common/djangoapps/header_control/decorators.py
rename to openedx/core/djangoapps/header_control/decorators.py
index cb0d148ad685deaa3f7755eacf0f35c9abafc38b..34f37951e58397da5d7835cb24bd5b9e8e75abaa 100644
--- a/common/djangoapps/header_control/decorators.py
+++ b/openedx/core/djangoapps/header_control/decorators.py
@@ -3,7 +3,7 @@ Middleware decorator for removing headers.
 """
 
 from functools import wraps
-from header_control import remove_headers_from_response, force_header_for_response
+from openedx.core.djangoapps.header_control import remove_headers_from_response, force_header_for_response
 
 
 def remove_headers(*headers):
diff --git a/common/djangoapps/header_control/middleware.py b/openedx/core/djangoapps/header_control/middleware.py
similarity index 100%
rename from common/djangoapps/header_control/middleware.py
rename to openedx/core/djangoapps/header_control/middleware.py
diff --git a/common/djangoapps/header_control/tests/__init__.py b/openedx/core/djangoapps/header_control/tests/__init__.py
similarity index 100%
rename from common/djangoapps/header_control/tests/__init__.py
rename to openedx/core/djangoapps/header_control/tests/__init__.py
diff --git a/common/djangoapps/header_control/tests/test_decorators.py b/openedx/core/djangoapps/header_control/tests/test_decorators.py
similarity index 91%
rename from common/djangoapps/header_control/tests/test_decorators.py
rename to openedx/core/djangoapps/header_control/tests/test_decorators.py
index cf5c1afbb0a64cd4e611c885b09d514f622a2119..926d837450780a3f85b41685aa607a3cb6995fa5 100644
--- a/common/djangoapps/header_control/tests/test_decorators.py
+++ b/openedx/core/djangoapps/header_control/tests/test_decorators.py
@@ -1,7 +1,8 @@
 """Tests for remove_headers and force_header decorator. """
 from django.http import HttpResponse, HttpRequest
 from django.test import TestCase
-from header_control.decorators import remove_headers, force_header
+
+from openedx.core.djangoapps.header_control.decorators import remove_headers, force_header
 
 
 def fake_view(_request):
diff --git a/common/djangoapps/header_control/tests/test_middleware.py b/openedx/core/djangoapps/header_control/tests/test_middleware.py
similarity index 93%
rename from common/djangoapps/header_control/tests/test_middleware.py
rename to openedx/core/djangoapps/header_control/tests/test_middleware.py
index 34e5e503c5f0d99b1f8fdc17e356381f4138119e..8f96861f5cd0d16da5090d5b0c06738e5d4dbb51 100644
--- a/common/djangoapps/header_control/tests/test_middleware.py
+++ b/openedx/core/djangoapps/header_control/tests/test_middleware.py
@@ -1,8 +1,9 @@
 """Tests for header_control middleware."""
 from django.http import HttpResponse, HttpRequest
 from django.test import TestCase
-from header_control import remove_headers_from_response, force_header_for_response
-from header_control.middleware import HeaderControlMiddleware
+
+from openedx.core.djangoapps.header_control import remove_headers_from_response, force_header_for_response
+from openedx.core.djangoapps.header_control.middleware import HeaderControlMiddleware
 
 
 class TestHeaderControlMiddlewareProcessResponse(TestCase):