diff --git a/server/core/lib/html/shared/common-embed-html.ts b/server/core/lib/html/shared/common-embed-html.ts
index 0f86d65bf..d17ea2efc 100644
--- a/server/core/lib/html/shared/common-embed-html.ts
+++ b/server/core/lib/html/shared/common-embed-html.ts
@@ -1,5 +1,6 @@
-import { MVideo, MVideoPlaylist } from '../../../types/models/index.js'
+import { MVideo } from '@server/types/models/video/video.js'
 import { TagsHtml } from './tags-html.js'
+import { MVideoPlaylist } from '@server/types/models/video/video-playlist.js'
 
 export class CommonEmbedHtml {
 
diff --git a/server/core/lib/html/shared/video-html.ts b/server/core/lib/html/shared/video-html.ts
index c8067daf5..ccad178a0 100644
--- a/server/core/lib/html/shared/video-html.ts
+++ b/server/core/lib/html/shared/video-html.ts
@@ -6,11 +6,10 @@ import validator from 'validator'
 import { CONFIG } from '../../../initializers/config.js'
 import { MEMOIZE_TTL, WEBSERVER } from '../../../initializers/constants.js'
 import { VideoModel } from '../../../models/video/video.js'
-import { MVideo } from '../../../types/models/index.js'
+import { MVideo, MVideoThumbnailBlacklist } from '../../../types/models/index.js'
 import { getActivityStreamDuration } from '../../activitypub/activity.js'
 import { isVideoInPrivateDirectory } from '../../video-privacy.js'
 import { Memoize } from '@server/helpers/memoize.js'
-import { MVideoThumbnailBlacklist } from 'server/dist/core/types/models/index.js'
 import { TagsHtml } from './tags-html.js'
 import { PageHtml } from './page-html.js'
 import { CommonEmbedHtml } from './common-embed-html.js'
diff --git a/server/core/lib/video-privacy.ts b/server/core/lib/video-privacy.ts
index df8ac974b..e7594c173 100644
--- a/server/core/lib/video-privacy.ts
+++ b/server/core/lib/video-privacy.ts
@@ -6,7 +6,7 @@ import { DIRECTORIES } from '@server/initializers/constants.js'
 import { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models/index.js'
 import { updateHLSFilesACL, updateWebVideoFileACL } from './object-storage/index.js'
 
-const validPrivacySet = new Set([
+const validPrivacySet = new Set<VideoPrivacyType>([
   VideoPrivacy.PRIVATE,
   VideoPrivacy.INTERNAL,
   VideoPrivacy.PASSWORD_PROTECTED
@@ -20,7 +20,7 @@ function setVideoPrivacy (video: MVideo, newPrivacy: VideoPrivacyType) {
   video.privacy = newPrivacy
 }
 
-function isVideoInPrivateDirectory (privacy) {
+function isVideoInPrivateDirectory (privacy: VideoPrivacyType) {
   return validPrivacySet.has(privacy)
 }