diff --git a/.gitattributes b/.gitattributes
index af724facbe8..c391244c550 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1721,6 +1721,7 @@ PDB/src/CGALPDB/PDB_align.cpp -text
 PDB/src/CGALPDB/PDB_distance.cpp -text
 PDB/src/CGALPDB/PDB_pdb_utils.cpp -text
 PDB/src/CGALPDB/PDB_transforms.cpp -text
+PDB/src/CGALPDB/all_files.cpp -text
 PDB/src/CGALPDB/makefile -text
 PDB/test/PDB/check_bonds.cpp -text
 PDB/test/PDB/check_hetatom.cpp -text
diff --git a/PDB/src/CGALPDB/all_files.cpp b/PDB/src/CGALPDB/all_files.cpp
new file mode 100644
index 00000000000..6c6189cb571
--- /dev/null
+++ b/PDB/src/CGALPDB/all_files.cpp
@@ -0,0 +1,14 @@
+#include "PDB_Atom.cpp"
+#include "PDB_Protein_pdb.cpp"
+#include "PDB_align.cpp"
+#include "PDB_Error_logger.cpp"
+#include "PDB_Quaternion.cpp"
+#include "PDB_distance.cpp"
+#include "PDB_Model.cpp"
+#include "PDB_Residue.cpp"
+#include "PDB_pdb_utils.cpp"
+#include "PDB_PDB.cpp"
+#include "PDB_Residue_data.cpp"
+#include "PDB_transforms.cpp"
+#include "PDB_Protein.cpp"
+#include "PDB_Transform.cpp"
diff --git a/PDB/src/CGALPDB/makefile b/PDB/src/CGALPDB/makefile
index c7bf6f611bc..afe17366a47 100644
--- a/PDB/src/CGALPDB/makefile
+++ b/PDB/src/CGALPDB/makefile
@@ -22,7 +22,12 @@
 #                    object files
 #---------------------------------------------------------------------#
 
-OBJECTS = \
+# We now compile all source files at once since it is faster
+# When adding a new file, please update app_files.cpp
+OBJECTS = all_files$(OBJ_EXT)
+
+# Below variable is not used now (but may come back so let's keep it)
+OBJECTS_OLD = \
 PDB_Atom$(OBJ_EXT) \
 PDB_Protein_pdb$(OBJ_EXT) \
 PDB_align$(OBJ_EXT) \