diff --git a/packages/client/src/hooks/useLibraryContext.tsx b/packages/client/src/hooks/useLibraryContext.tsx
index da32c2d67..9838b9764 100644
--- a/packages/client/src/hooks/useLibraryContext.tsx
+++ b/packages/client/src/hooks/useLibraryContext.tsx
@@ -1,6 +1,6 @@
 import { PropsWithChildren, createContext, useContext, useState } from 'react';
-import { useBridgeSubscription } from '..';
 import { LibraryConfigWrapped } from '../core';
+import { useBridgeSubscription } from '../rspc';
 import { ClientContext, useClientContext } from './useClientContext';
 
 export interface LibraryContext {
diff --git a/packages/client/src/hooks/useOnboardingStore.ts b/packages/client/src/hooks/useOnboardingStore.ts
index 91f05cfe1..4cf4e1680 100644
--- a/packages/client/src/hooks/useOnboardingStore.ts
+++ b/packages/client/src/hooks/useOnboardingStore.ts
@@ -1,5 +1,5 @@
 import { useSnapshot } from 'valtio';
-import { valtioPersist } from '../lib/valito';
+import { valtioPersist } from '../lib';
 
 export enum UseCase {
 	CameraRoll = 'cameraRoll',
diff --git a/packages/client/src/hooks/useP2PEvents.tsx b/packages/client/src/hooks/useP2PEvents.tsx
index c31d02453..f72e11fd4 100644
--- a/packages/client/src/hooks/useP2PEvents.tsx
+++ b/packages/client/src/hooks/useP2PEvents.tsx
@@ -1,5 +1,6 @@
 import { PropsWithChildren, createContext, useContext, useState } from 'react';
-import { PeerMetadata, useBridgeSubscription } from '..';
+import { PeerMetadata } from '../core';
+import { useBridgeSubscription } from '../rspc';
 
 const Context = createContext<Map<string, PeerMetadata>>(null as any);
 
diff --git a/packages/client/src/hooks/usePlausible.tsx b/packages/client/src/hooks/usePlausible.tsx
index 586770e23..4d5abfca3 100644
--- a/packages/client/src/hooks/usePlausible.tsx
+++ b/packages/client/src/hooks/usePlausible.tsx
@@ -1,6 +1,7 @@
 import Plausible, { PlausibleOptions as PlausibleTrackerOptions } from 'plausible-tracker';
 import { useCallback, useEffect, useRef } from 'react';
-import { PlausiblePlatformType, telemetryStore, useDebugState, useTelemetryState } from '..';
+import { useDebugState } from './useDebugState';
+import { PlausiblePlatformType, telemetryStore, useTelemetryState } from './useTelemetryState';
 
 /**
  * This should be in sync with the Core's version.
diff --git a/packages/client/src/hooks/useTelemetryState.tsx b/packages/client/src/hooks/useTelemetryState.tsx
index d2f4b3fe0..7362ac52e 100644
--- a/packages/client/src/hooks/useTelemetryState.tsx
+++ b/packages/client/src/hooks/useTelemetryState.tsx
@@ -1,5 +1,5 @@
 import { useSnapshot } from 'valtio';
-import { valtioPersist } from '..';
+import { valtioPersist } from '../lib';
 
 /**
  * Possible Platform types that can be sourced from `usePlatform().platform` or even hardcoded.
diff --git a/packages/client/src/hooks/useThemeStore.ts b/packages/client/src/hooks/useThemeStore.ts
index 6910a3bbc..07ff71311 100644
--- a/packages/client/src/hooks/useThemeStore.ts
+++ b/packages/client/src/hooks/useThemeStore.ts
@@ -1,5 +1,5 @@
 import { useSnapshot } from 'valtio';
-import { valtioPersist } from '..';
+import { valtioPersist } from '../lib';
 
 export type Themes = 'vanilla' | 'dark';