diff --git a/source/graphics/Color.cpp b/source/graphics/Color.cpp
index beb26ef9b0..a5e4b142ea 100644
--- a/source/graphics/Color.cpp
+++ b/source/graphics/Color.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 #include "graphics/Color.h"
 
 #include "graphics/SColor.h"
+#include "lib/sysdep/arch/x86_x64/simd.h"
 #include "maths/MathUtil.h"
-#include "lib/sse.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 
diff --git a/source/graphics/ModelDef.cpp b/source/graphics/ModelDef.cpp
index 3f16eca012..25b5c376f0 100644
--- a/source/graphics/ModelDef.cpp
+++ b/source/graphics/ModelDef.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 
 #include "ModelDef.h"
 #include "graphics/SkeletonAnimDef.h"
-#include "lib/sse.h"
+#include "lib/sysdep/arch/x86_x64/simd.h"
 #include "ps/FileIo.h"
 #include "maths/Vector4D.h"
 
diff --git a/source/lib/sse.cpp b/source/lib/sysdep/arch/x86_x64/simd.cpp
similarity index 94%
rename from source/lib/sse.cpp
rename to source/lib/sysdep/arch/x86_x64/simd.cpp
index f3826884ad..a374ea17cc 100644
--- a/source/lib/sse.cpp
+++ b/source/lib/sysdep/arch/x86_x64/simd.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 
 #include "precompiled.h"
 
-#include "lib/sse.h"
+#include "lib/sysdep/arch/x86_x64/simd.h"
 
 #if COMPILER_HAS_SSE
 #include "lib/code_generation.h"
diff --git a/source/lib/sse.h b/source/lib/sysdep/arch/x86_x64/simd.h
similarity index 97%
rename from source/lib/sse.h
rename to source/lib/sysdep/arch/x86_x64/simd.h
index 6bddebfefa..d097f5fe0a 100644
--- a/source/lib/sse.h
+++ b/source/lib/sysdep/arch/x86_x64/simd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the