diff --git a/libs/product/src/public_api.ts b/libs/product/src/public_api.ts
index 5205d71f07..eb95749690 100644
--- a/libs/product/src/public_api.ts
+++ b/libs/product/src/public_api.ts
@@ -1,3 +1,2 @@
 export * from './models/public_api';
 export * from './helpers/public_api';
-export * from './injection-tokens/public_api';
diff --git a/libs/product/state/src/effects/best-seller.effects.ts b/libs/product/state/src/effects/best-seller.effects.ts
index 4d119bca5e..33679b49f9 100644
--- a/libs/product/state/src/effects/best-seller.effects.ts
+++ b/libs/product/state/src/effects/best-seller.effects.ts
@@ -19,10 +19,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffProduct,
-  DAFF_PRODUCT_ERROR_MATCHER,
-} from '@daffodil/product';
+import { DaffProduct } from '@daffodil/product';
 import {
   DaffProductDriver,
   DaffProductServiceInterface,
@@ -34,6 +31,7 @@ import {
   DaffBestSellersLoadFailure,
   DaffBestSellersLoadSuccess,
 } from '../actions/public_api';
+import { DAFF_PRODUCT_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 /**
  * Effects for handling best seller actions and best seller service requests.
diff --git a/libs/product/state/src/effects/product-grid.effects.ts b/libs/product/state/src/effects/product-grid.effects.ts
index 9395339502..d50458cbf9 100644
--- a/libs/product/state/src/effects/product-grid.effects.ts
+++ b/libs/product/state/src/effects/product-grid.effects.ts
@@ -19,10 +19,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffProduct,
-  DAFF_PRODUCT_ERROR_MATCHER,
-} from '@daffodil/product';
+import { DaffProduct } from '@daffodil/product';
 import {
   DaffProductDriver,
   DaffProductServiceInterface,
@@ -34,6 +31,7 @@ import {
   DaffProductGridLoadSuccess,
   DaffProductGridLoadFailure,
 } from '../actions/product-grid.actions';
+import { DAFF_PRODUCT_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 /**
  * Effects for handling product grid actions and for triggering corresponding service requests.
diff --git a/libs/product/state/src/effects/product-page.effects.ts b/libs/product/state/src/effects/product-page.effects.ts
index a2ea93b1d5..e81f8ffa59 100644
--- a/libs/product/state/src/effects/product-page.effects.ts
+++ b/libs/product/state/src/effects/product-page.effects.ts
@@ -19,10 +19,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffProduct,
-  DAFF_PRODUCT_ERROR_MATCHER,
-} from '@daffodil/product';
+import { DaffProduct } from '@daffodil/product';
 import {
   DaffProductDriver,
   DaffProductServiceInterface,
@@ -35,6 +32,7 @@ import {
   DaffProductPageLoadSuccess,
   DaffProductPageLoadByUrl,
 } from '../actions/product-page.actions';
+import { DAFF_PRODUCT_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 /**
  * Effects for handling product actions and for triggering corresponding service requests.
diff --git a/libs/product/state/src/effects/product.effects.ts b/libs/product/state/src/effects/product.effects.ts
index e5f00a8223..043532e744 100644
--- a/libs/product/state/src/effects/product.effects.ts
+++ b/libs/product/state/src/effects/product.effects.ts
@@ -19,10 +19,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffProduct,
-  DAFF_PRODUCT_ERROR_MATCHER,
-} from '@daffodil/product';
+import { DaffProduct } from '@daffodil/product';
 import {
   DaffProductDriver,
   DaffProductServiceInterface,
@@ -34,6 +31,7 @@ import {
   DaffProductLoadSuccess,
   DaffProductLoadFailure,
 } from '../actions/product.actions';
+import { DAFF_PRODUCT_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 /**
  * Effects for handling product actions and for triggering corresponding service requests.
diff --git a/libs/product/src/injection-tokens/error-matcher.token.ts b/libs/product/state/src/injection-tokens/error-matcher.token.ts
similarity index 100%
rename from libs/product/src/injection-tokens/error-matcher.token.ts
rename to libs/product/state/src/injection-tokens/error-matcher.token.ts
diff --git a/libs/product/src/injection-tokens/public_api.ts b/libs/product/state/src/injection-tokens/public_api.ts
similarity index 100%
rename from libs/product/src/injection-tokens/public_api.ts
rename to libs/product/state/src/injection-tokens/public_api.ts
diff --git a/libs/product/state/src/public_api.ts b/libs/product/state/src/public_api.ts
index 06473e3a57..32f729858c 100644
--- a/libs/product/state/src/public_api.ts
+++ b/libs/product/state/src/public_api.ts
@@ -3,5 +3,6 @@ export * from './effects/public_api';
 export * from './facades/public_api';
 export * from './reducers/public_api';
 export * from './selectors/public_api';
+export * from './injection-tokens/public_api';
 
 export { DaffProductStateModule } from './product-state.module';