diff --git a/components/common.less b/components/common.less
index 3cac165c8..700354ed2 100644
--- a/components/common.less
+++ b/components/common.less
@@ -3,7 +3,7 @@
  * prepended with @noflip in a comment block.
  *
  */
-@import 'mediawiki.mixins';
+@import 'mediawiki.mixins.less';
 
 /* Framework */
 html {
diff --git a/components/navigation.less b/components/navigation.less
index 1a553c3db..b061a0162 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -1,7 +1,7 @@
-@import 'mediawiki.mixins';
-@import 'personalNavigation';
-@import 'search';
-@import 'tabs';
+@import 'mediawiki.mixins.less';
+@import 'personalNavigation.less';
+@import 'search.less';
+@import 'tabs.less';
 
 /* Hide, but keep accessible for screen-readers */
 #mw-navigation h2 {
diff --git a/components/search.less b/components/search.less
index 8498ddaa4..37baa51a1 100644
--- a/components/search.less
+++ b/components/search.less
@@ -1,5 +1,5 @@
-@import 'mediawiki.mixins';
-@import 'mediawiki.ui/variables';
+@import 'mediawiki.mixins.less';
+@import 'mediawiki.ui/variables.less';
 
 /* Search */
 #p-search {
diff --git a/components/tabs.less b/components/tabs.less
index dffff0dd2..4a66c1b10 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -1,5 +1,5 @@
-@import '../variables';
-@import 'mediawiki.mixins';
+@import '../variables.less';
+@import 'mediawiki.mixins.less';
 
 /**
  * Styling for namespace tabs (page, discussion) and views (read, edit, view history, watch and other actions)
diff --git a/components/watchstar.less b/components/watchstar.less
index 2dbd5d01e..aaea6d0ea 100644
--- a/components/watchstar.less
+++ b/components/watchstar.less
@@ -1,5 +1,5 @@
-@import '../variables';
-@import 'mediawiki.mixins.rotation';
+@import '../variables.less';
+@import 'mediawiki.mixins.rotation.less';
 
 /* Watch/Unwatch Icon Styling */
 /* Only use icon if the menu item is not collapsed into the "More" dropdown
diff --git a/responsive.less b/responsive.less
index 22448c654..1926c18f2 100644
--- a/responsive.less
+++ b/responsive.less
@@ -3,7 +3,7 @@
 	instead of to the side of it. They also hide the logo, as there's no space
 	left for it.
 */
-@import 'mediawiki.ui/variables';
+@import 'mediawiki.ui/variables.less';
 
 @media screen and ( max-width: @width-breakpoint-tablet ) {
 	#mw-head {
diff --git a/skinStyles/mediawiki.notification.less b/skinStyles/mediawiki.notification.less
index 399f61c33..78e0ab78b 100644
--- a/skinStyles/mediawiki.notification.less
+++ b/skinStyles/mediawiki.notification.less
@@ -1,4 +1,4 @@
-@import 'mediawiki.ui/variables';
+@import 'mediawiki.ui/variables.less';
 @import '../variables.less';
 
 /* mediawiki.notification */
diff --git a/variables.less b/variables.less
index 44ccc9e43..01858cb1f 100644
--- a/variables.less
+++ b/variables.less
@@ -1,4 +1,4 @@
-@import 'mediawiki.ui/variables';
+@import 'mediawiki.ui/variables.less';
 
 @font-size-root: 100%;
 @font-size-browser: 16; // Assumed browser default of `16px`