diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index 6d95efd29137002ae77255b6074056fd9de78b58..a90b2022f0a83538d8a4d90437f3ed97c096e47a 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -393,7 +393,6 @@ library
     Distribution.Types.VersionRange
     Distribution.Types.VersionInterval
     Distribution.Types.GivenComponent
-    Distribution.Types.PackageVersionConstraint
     Distribution.Utils.Generic
     Distribution.Utils.NubList
     Distribution.Utils.ShortText
diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/Distribution/Client/Configure.hs
index abafce7ac4e199955cfdfe66383e4409bddc844b..2d9726fb91349aacf2331b7d8a2162a2f387a928 100644
--- a/cabal-install/Distribution/Client/Configure.hs
+++ b/cabal-install/Distribution/Client/Configure.hs
@@ -66,7 +66,7 @@ import Distribution.Types.Dependency
          ( thisPackageVersion )
 import Distribution.Types.GivenComponent
          ( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint(..) )
 import qualified Distribution.PackageDescription as PkgDesc
 import Distribution.PackageDescription.Parsec
diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index df2c7bb4b7e427354181f8ee5a3f32965788930a..dfaa7624c9e0063b5e65e3030936cc514a38cc0f 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -146,7 +146,7 @@ import Distribution.Types.Dependency
          ( thisPackageVersion )
 import Distribution.Types.GivenComponent
          ( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint(..) )
 import Distribution.Types.MungedPackageId
 import qualified Distribution.PackageDescription as PackageDescription
diff --git a/Cabal/Distribution/Types/PackageVersionConstraint.hs b/cabal-install/Distribution/Client/PackageVersionConstraint.hs
similarity index 93%
rename from Cabal/Distribution/Types/PackageVersionConstraint.hs
rename to cabal-install/Distribution/Client/PackageVersionConstraint.hs
index db93ba77f3dd599af3f60899ce81eb2698511594..9733e6a015407329bd56913052b92b5d8c9b7457 100644
--- a/Cabal/Distribution/Types/PackageVersionConstraint.hs
+++ b/cabal-install/Distribution/Client/PackageVersionConstraint.hs
@@ -1,10 +1,10 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
-module Distribution.Types.PackageVersionConstraint
+module Distribution.Client.PackageVersionConstraint
   ( PackageVersionConstraint(..)
   ) where
 
-import Distribution.Compat.Prelude
+import Distribution.Client.Compat.Prelude
 import Prelude ()
 
 import Distribution.Parsec
diff --git a/cabal-install/Distribution/Client/ProjectConfig.hs b/cabal-install/Distribution/Client/ProjectConfig.hs
index a8b17131f40e7ca9233ff4b16d423aee0bfbd79b..906aaf60c0387c5931c4a6a5c6fda21503e25a26 100644
--- a/cabal-install/Distribution/Client/ProjectConfig.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig.hs
@@ -83,7 +83,7 @@ import Distribution.Solver.Types.PackageConstraint
 
 import Distribution.Package
          ( PackageName, PackageId, packageId, UnitId )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint(..) )
 import Distribution.System
          ( Platform )
diff --git a/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
index 2a373a5e8e871a06d8370a70943fb67650d589bb..eae2587d443dc23279e4a9e80d37693e126911cc 100644
--- a/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
@@ -83,7 +83,7 @@ import Distribution.Client.ParseUtils
 import Distribution.Simple.Command
          ( CommandUI(commandOptions), ShowOrParseArgs(..)
          , OptionField, option, reqArg' )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint )
 
 import qualified Data.Map as Map
diff --git a/cabal-install/Distribution/Client/ProjectConfig/Types.hs b/cabal-install/Distribution/Client/ProjectConfig/Types.hs
index 3a17786d95b849e2068eeb9d7151d995124637e1..5a9a361a47467fef87447c8c9e55ca7933790404 100644
--- a/cabal-install/Distribution/Client/ProjectConfig/Types.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig/Types.hs
@@ -38,7 +38,7 @@ import Distribution.Solver.Types.ConstraintSource
 
 import Distribution.Package
          ( PackageName, PackageId, UnitId )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint )
 import Distribution.Version
          ( Version )
diff --git a/cabal-install/Distribution/Client/ProjectPlanning.hs b/cabal-install/Distribution/Client/ProjectPlanning.hs
index c0392568a95940e0658d2d9f96f94aa444b32ae9..f201fda94072c74cdd0894b6a08a578f3def0217 100644
--- a/cabal-install/Distribution/Client/ProjectPlanning.hs
+++ b/cabal-install/Distribution/Client/ProjectPlanning.hs
@@ -115,7 +115,7 @@ import           Distribution.Types.ComponentName
 import           Distribution.Types.LibraryName
 import           Distribution.Types.GivenComponent
   (GivenComponent(..))
-import           Distribution.Types.PackageVersionConstraint
+import           Distribution.Client.PackageVersionConstraint
 import           Distribution.Types.PkgconfigDependency
 import           Distribution.Types.UnqualComponentName
 import           Distribution.System
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index fa4adee047ac4218b5b57895a0303c32cadb689d..d83016a6fc9c28667d59e79b794ad15bd6936b5a 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -119,7 +119,7 @@ import Distribution.Package
 import Distribution.Types.Dependency
 import Distribution.Types.GivenComponent
          ( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
          ( PackageVersionConstraint(..) )
 import Distribution.Types.UnqualComponentName
          ( unqualComponentNameToPackageName )
diff --git a/cabal-install/Distribution/Deprecated/Text.hs b/cabal-install/Distribution/Deprecated/Text.hs
index a93521ddd8416e62f6a7042cfd328870dfac3b38..95a17f8df8284fc7a24948de5d8d563388de0e7f 100644
--- a/cabal-install/Distribution/Deprecated/Text.hs
+++ b/cabal-install/Distribution/Deprecated/Text.hs
@@ -46,7 +46,7 @@ import qualified Distribution.Simple.Setup                   as D
 import qualified Distribution.System                         as D
 import qualified Distribution.Types.MungedPackageId        as D
 import qualified Distribution.Types.MungedPackageName        as D
-import qualified Distribution.Types.PackageVersionConstraint as D
+import qualified Distribution.Client.PackageVersionConstraint as D
 import qualified Distribution.Types.SourceRepo               as D
 import qualified Distribution.Types.UnqualComponentName      as D
 import qualified Distribution.Version                        as D
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 19bff1a76484fa8d5773b6c2ada6410575389286..5e78a0f6851e7ed34fbb12c751c1986223742dcf 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -213,6 +213,7 @@ executable cabal
         Distribution.Client.Outdated
         Distribution.Client.PackageHash
         Distribution.Client.PackageUtils
+        Distribution.Client.PackageVersionConstraint
         Distribution.Client.ParseUtils
         Distribution.Client.ProjectBuilding
         Distribution.Client.ProjectBuilding.Types
diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
index b0f64c246438a8bb30935a7b0acc1e72577d79c1..b5312dd0d061cd026104be0c887cf79f437dd8d2 100644
--- a/cabal-install/cabal-install.cabal.pp
+++ b/cabal-install/cabal-install.cabal.pp
@@ -138,6 +138,7 @@ Version:            2.5.0.0
         Distribution.Client.Outdated
         Distribution.Client.PackageHash
         Distribution.Client.PackageUtils
+        Distribution.Client.PackageVersionConstraint
         Distribution.Client.ParseUtils
         Distribution.Client.ProjectBuilding
         Distribution.Client.ProjectBuilding.Types