diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f36fcc..a1b67f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,12 +24,7 @@ jobs:
         run: |
           lean --version
           lake --version
-      
-      - name: check ls 
-        run: |
-          ls -a
-          
-      
+
       - name: build cache
         run: |
           lake exe cache get
@@ -41,7 +36,14 @@ jobs:
           linters: gcc
           run: |
             bash -o pipefail -c "env LEAN_ABORT_ON_PANIC=1 lake build -KCI | tee stdout.log"
-      
+
+      - name: check file imports 
+        id : check_file_imports 
+        uses: liskin/gh-problem-matcher-wrap@v3
+        with : 
+          linters : gcc 
+          run : env LEAN_ABORT_ON_PANIC=1 lake exe check_file_imports
+
       - name: lint HepLean
         if: ${{ always() && steps.build.outcome == 'success' || steps.build.outcome == 'failure' }}
         id: lint
diff --git a/HepLean.lean b/HepLean.lean
index ee22052..a64b14b 100644
--- a/HepLean.lean
+++ b/HepLean.lean
@@ -73,7 +73,6 @@ import HepLean.SpaceTime.LorentzGroup.Proper
 import HepLean.SpaceTime.LorentzGroup.Rotations
 import HepLean.SpaceTime.Metric
 import HepLean.SpaceTime.SL2C.Basic
-import HepLean.StandardModel.Basic
 import HepLean.StandardModel.HiggsBoson.Basic
-import HepLean.StandardModel.HiggsBoson.TargetSpace
+import HepLean.StandardModel.Basic
 import HepLean.StandardModel.Representations
diff --git a/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean b/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
index a9cdaa3..822e56e 100644
--- a/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
+++ b/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
@@ -33,6 +33,5 @@ def potential (Φ1 Φ2 : higgsField)
   + (lam₆ * Φ1.normSq x * (Φ1.innerProd Φ2) x + conj lam₆ * Φ1.normSq x * (Φ2.innerProd Φ1) x).re
   + (lam₇ * Φ2.normSq x * (Φ1.innerProd Φ2) x + conj lam₇ * Φ2.normSq x * (Φ2.innerProd Φ1) x).re
 
-
 end
 end TwoHDM
diff --git a/lakefile.toml b/lakefile.toml
index 5444a11..7a85735 100644
--- a/lakefile.toml
+++ b/lakefile.toml
@@ -12,3 +12,7 @@ rev = "main"
 
 [[lean_lib]]
 name = "HepLean"
+
+[[lean_exe]]
+name = "check_file_imports"
+srcDir = "scripts"
diff --git a/scripts/check_file_imports.lean b/scripts/check_file_imports.lean
new file mode 100644
index 0000000..96d4783
--- /dev/null
+++ b/scripts/check_file_imports.lean
@@ -0,0 +1,95 @@
+/-
+Copyright (c) 2024 Joseph Tooby-Smith. All rights reserved.
+Released under Apache 2.0 license.
+Authors: Joseph Tooby-Smith
+-/
+import Lean
+import Batteries.Lean.HashSet
+import HepLean
+/-!
+
+# Check file imports
+
+This file checks that the imports in `HepLean.lean` are sorted and complete.
+
+It can be run from the terminal using
+`lake exe check_file_imports`.
+
+## Note on adaptation
+
+The functions
+
+`addModulesIn`, `expectedHepLeanImports`, and `checkMissingImports`
+
+are adapted from `batteries.scripts.check_imports.lean` authored by Joe Hendrix.
+
+
+-/
+open Lean System Meta
+
+
+/--  Recursively finds files in directory. -/
+partial def addModulesIn (recurse : Bool) (prev : Array Name) (root : Name := .anonymous)
+    (path : FilePath) : IO (Array Name) := do
+  let mut r := prev
+  for entry in ← path.readDir do
+    if ← entry.path.isDir then
+      if recurse then
+        r ← addModulesIn recurse r (root.mkStr entry.fileName) entry.path
+    else
+      let .some mod := FilePath.fileStem entry.fileName
+        | continue
+      r := r.push (root.mkStr mod)
+  pure r
+
+
+/-- Compute imports expected by `HepLean.lean` by looking at file structure. -/
+def expectedHepLeanImports : IO (Array Name) := do
+  let mut needed := #[]
+  for top in ← FilePath.readDir "HepLean" do
+      let nm := `HepLean
+      let rootname := FilePath.withExtension top.fileName ""
+      let root :=  nm.mkStr rootname.toString
+      if ← top.path.isDir then
+        needed ← addModulesIn (recurse := true) needed (root := root) top.path
+      else
+        needed :=
+        needed.push root
+  pure needed
+
+/-- Checks whether an array `imports` is sorted after `Init` is removed.  -/
+def arrayImportSorted (imports : Array Import) : IO Bool :=  do
+  let X := (imports.map (fun x => x.module.toString)).filter (fun x => x != "Init")
+  let mut warned := false
+  if ! X = X.qsort (· < ·) then
+    IO.print s!"Import file is not sorted. \n"
+    warned := true
+  pure warned
+
+/-- Checks every file in `reqImports` is imported into `modData`
+  return true if this is NOT the case. -/
+def checkMissingImports (modData : ModuleData) (reqImports : Array Name) :
+    IO Bool := do
+  let names : HashSet Name := HashSet.ofArray (modData.imports.map (·.module))
+  let mut warned := false
+  for req in reqImports do
+    if !names.contains req then
+      IO.print s!"File {req} is not imported. \n"
+      warned := true
+  pure warned
+
+def main (_ : List String) : IO UInt32 := do
+  initSearchPath (← findSysroot)
+  let mods : Name :=  `HepLean
+  let imp :  Import := {module := mods}
+  let mFile ← findOLean imp.module
+  unless (← mFile.pathExists) do
+        throw <| IO.userError s!"object file '{mFile}' of module {imp.module} does not exist"
+  let (hepLeanMod, _) ← readModuleData mFile
+  let eHepLeanImports ← expectedHepLeanImports
+  let sortedWarned ← arrayImportSorted hepLeanMod.imports
+  let warned ← checkMissingImports hepLeanMod eHepLeanImports
+  if (warned ∨ sortedWarned) then
+    throw <| IO.userError s!"The HepLean module is not sorted, or has missing imports."
+  IO.println s!"Import check complete."
+  pure 0