diff --git a/Sofa/Component/Collision/Detection/Algorithm/CMakeLists.txt b/Sofa/Component/Collision/Detection/Algorithm/CMakeLists.txt
index 296fae17d65..cc503bf09d6 100644
--- a/Sofa/Component/Collision/Detection/Algorithm/CMakeLists.txt
+++ b/Sofa/Component/Collision/Detection/Algorithm/CMakeLists.txt
@@ -12,7 +12,6 @@ set(HEADER_FILES
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/CollisionPM.h
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/DSAPBox.h
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/CollisionPipeline.h
- ${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/DefaultPipeline.h
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/DirectSAP.h
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/DirectSAPNarrowPhase.h
${SOFACOMPONENTCOLLISIONDETECTIONALGORITHM_SOURCE_DIR}/EndPoint.h
diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DefaultPipeline.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DefaultPipeline.h
deleted file mode 100644
index 1a314c41047..00000000000
--- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DefaultPipeline.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-#include
-
-SOFA_HEADER_DISABLED("v23.06", "v23.12", "sofa/component/collision/detection/algorithm/CollisionPipeline.h")
diff --git a/Sofa/Component/Collision/Response/Contact/CMakeLists.txt b/Sofa/Component/Collision/Response/Contact/CMakeLists.txt
index 9ea5c096b4d..b9c0952496d 100644
--- a/Sofa/Component/Collision/Response/Contact/CMakeLists.txt
+++ b/Sofa/Component/Collision/Response/Contact/CMakeLists.txt
@@ -17,7 +17,6 @@ set(HEADER_FILES
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/CollisionResponse.h
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/ContactIdentifier.h
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/ContactListener.h
- ${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/DefaultContactManager.h
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/FrictionContact.h
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/FrictionContact.inl
${SOFACOMPONENTCOLLISIONRESPONSECONTACT_SOURCE_DIR}/PenalityContactForceField.h
diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/DefaultContactManager.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/DefaultContactManager.h
deleted file mode 100644
index 3c8eec704f0..00000000000
--- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/DefaultContactManager.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-#include
-
-SOFA_HEADER_DISABLED("v23.06", "v23.12", "sofa/component/collision/response/contact/CollisionResponse.h")
diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/CMakeLists.txt b/Sofa/Component/Constraint/Lagrangian/Solver/CMakeLists.txt
index c42f8030d0f..0cf052b1d98 100644
--- a/Sofa/Component/Constraint/Lagrangian/Solver/CMakeLists.txt
+++ b/Sofa/Component/Constraint/Lagrangian/Solver/CMakeLists.txt
@@ -7,7 +7,6 @@ set(HEADER_FILES
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/config.h.in
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/init.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/ConstraintSolverImpl.h
- ${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/ConstraintStoreLambdaVisitor.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/GenericConstraintProblem.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/GenericConstraintSolver.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/LCPConstraintSolver.h
@@ -15,8 +14,6 @@ set(HEADER_FILES
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/visitors/ConstraintStoreLambdaVisitor.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/visitors/MechanicalGetConstraintViolationVisitor.h
${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/visitors/MechanicalGetConstraintResolutionVisitor.h
-
- ${SOFACOMPONENTCONSTRAINTLAGRANGIANSOLVER_SOURCE_DIR}/ConstraintStoreLambdaVisitor.h #For deprecation
)
set(SOURCE_FILES
diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintStoreLambdaVisitor.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintStoreLambdaVisitor.h
deleted file mode 100644
index 5e23105e037..00000000000
--- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintStoreLambdaVisitor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-#include
-
-SOFA_HEADER_DISABLED("v22.12", "v23.06", "sofa/component/constraint/lagrangian/solver/visitors/ConstraintStoreLambdaVisitor.h")
diff --git a/Sofa/Component/Mapping/NonLinear/CMakeLists.txt b/Sofa/Component/Mapping/NonLinear/CMakeLists.txt
index d97638d9c41..373f3b7f944 100644
--- a/Sofa/Component/Mapping/NonLinear/CMakeLists.txt
+++ b/Sofa/Component/Mapping/NonLinear/CMakeLists.txt
@@ -19,7 +19,6 @@ set(HEADER_FILES
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/NonLinearMappingData.h
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/RigidMapping.h
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/RigidMapping.inl
- ${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/RigidRigidMapping.h
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/SquareDistanceMapping.h
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/SquareDistanceMapping.inl
${SOFACOMPONENTMAPPINGNONLINEAR_SOURCE_DIR}/SquareMapping.h
diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidRigidMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidRigidMapping.h
deleted file mode 100644
index f94c375dd73..00000000000
--- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidRigidMapping.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-#include
-
-SOFA_HEADER_DISABLED_NOT_REPLACED("v23.06", "v23.12")
-
-// This component has been DEPRECATED since SOFA v23.06 and will be removed in SOFA v23.12.
-// Please use RigidMapping with template='Rigid3,Rigid3' instead.
-// If this component is crucial to you please report that to sofa-dev@ so we can reconsider this component for future re-integration.
diff --git a/Sofa/GL/CMakeLists.txt b/Sofa/GL/CMakeLists.txt
index aaabe5204a7..7126970ccda 100644
--- a/Sofa/GL/CMakeLists.txt
+++ b/Sofa/GL/CMakeLists.txt
@@ -19,7 +19,6 @@ set(HEADER_FILES
${SOFAGLSRC_ROOT}/gl.h
${SOFAGLSRC_ROOT}/glu.h
${SOFAGLSRC_ROOT}/Capture.h
- ${SOFAGLSRC_ROOT}/Color.h
${SOFAGLSRC_ROOT}/RAII.h
${SOFAGLSRC_ROOT}/template.h
${SOFAGLSRC_ROOT}/Axis.h
diff --git a/Sofa/GL/src/sofa/gl/Color.h b/Sofa/GL/src/sofa/gl/Color.h
deleted file mode 100644
index 1d1fde6cd13..00000000000
--- a/Sofa/GL/src/sofa/gl/Color.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-#include
-
-SOFA_HEADER_DISABLED_NOT_REPLACED("v17.06", "v23.12")
diff --git a/Sofa/framework/Helper/CMakeLists.txt b/Sofa/framework/Helper/CMakeLists.txt
index b1e84de9954..a3f30be4a4e 100644
--- a/Sofa/framework/Helper/CMakeLists.txt
+++ b/Sofa/framework/Helper/CMakeLists.txt
@@ -82,7 +82,6 @@ set(HEADER_FILES
${SRC_ROOT}/map.h
${SRC_ROOT}/map_ptr_stable_compare.h
${SRC_ROOT}/pair.h
- ${SRC_ROOT}/proximity.h
${SRC_ROOT}/random.h
${SRC_ROOT}/rmath.h
${SRC_ROOT}/set.h
diff --git a/Sofa/framework/Helper/src/sofa/helper/proximity.h b/Sofa/framework/Helper/src/sofa/helper/proximity.h
deleted file mode 100644
index b2f68eaeb6f..00000000000
--- a/Sofa/framework/Helper/src/sofa/helper/proximity.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-
-#include
-
-SOFA_HEADER_DISABLED("v23.06", "v23.12", "sofa/geometry/proximity/PointTriangle.h, sofa/geometry/proximity/SegmentTriangle.h or sofa/geometry/proximity/TriangleTriangle.h")
diff --git a/Sofa/framework/Simulation/Core/CMakeLists.txt b/Sofa/framework/Simulation/Core/CMakeLists.txt
index bca202e9d0c..3889171df36 100644
--- a/Sofa/framework/Simulation/Core/CMakeLists.txt
+++ b/Sofa/framework/Simulation/Core/CMakeLists.txt
@@ -11,7 +11,6 @@ set(HEADER_FILES
${SRC_ROOT}/AnimateVisitor.h
${SRC_ROOT}/BaseMechanicalVisitor.h
${SRC_ROOT}/BehaviorUpdatePositionVisitor.h
- ${SRC_ROOT}/CactusStackStorage.h
${SRC_ROOT}/CleanupVisitor.h
${SRC_ROOT}/CollisionAnimationLoop.h
${SRC_ROOT}/CollisionBeginEvent.h
@@ -30,7 +29,6 @@ set(HEADER_FILES
${SRC_ROOT}/InitVisitor.h
${SRC_ROOT}/IntegrateBeginEvent.h
${SRC_ROOT}/IntegrateEndEvent.h
- ${SRC_ROOT}/LocalStorage.h
${SRC_ROOT}/MechanicalOperations.h
${SRC_ROOT}/MechanicalVPrintVisitor.h
${SRC_ROOT}/MechanicalVisitor.h
@@ -39,7 +37,6 @@ set(HEADER_FILES
${SRC_ROOT}/Node.inl
${SRC_ROOT}/ParallelForEach.h
${SRC_ROOT}/ParallelSparseMatrixProduct.h
- ${SRC_ROOT}/ParallelVisitorScheduler.h
${SRC_ROOT}/PauseEvent.h
${SRC_ROOT}/PipelineImpl.h
${SRC_ROOT}/PositionEvent.h
@@ -63,7 +60,6 @@ set(HEADER_FILES
${SRC_ROOT}/VelocityThresholdVisitor.h
${SRC_ROOT}/Visitor.h
${SRC_ROOT}/VisitorExecuteFunc.h
- ${SRC_ROOT}/VisitorScheduler.h
${SRC_ROOT}/VisualVisitor.h
${SRC_ROOT}/WriteStateVisitor.h
${SRC_ROOT}/XMLPrintVisitor.h
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp
index b20d1234b2b..2abde63d270 100644
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp
+++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/CactusStackStorage.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/CactusStackStorage.h
deleted file mode 100644
index 45ece5263bb..00000000000
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/CactusStackStorage.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#ifndef SOFA_SIMULATION_TREE_CACTUSSTACKSTORAGE_H
-#define SOFA_SIMULATION_TREE_CACTUSSTACKSTORAGE_H
-
-#include
-
-SOFA_HEADER_DISABLED_LOCALSTORAGE()
-
-#endif
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/LocalStorage.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/LocalStorage.h
deleted file mode 100644
index 116b1886f03..00000000000
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/LocalStorage.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#ifndef SOFA_SIMULATION_TREE_LOCALSTORAGE_H
-#define SOFA_SIMULATION_TREE_LOCALSTORAGE_H
-
-#include
-
-SOFA_HEADER_DISABLED_LOCALSTORAGE()
-
-#endif
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp
index 025e2f5c549..286eb32e1ba 100644
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp
+++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp
@@ -49,7 +49,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelVisitorScheduler.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelVisitorScheduler.h
deleted file mode 100644
index 4304950b295..00000000000
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelVisitorScheduler.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#ifndef SOFA_SIMULATION_CORE_PARALLELACTIONSCHEDULER_H
-#define SOFA_SIMULATION_CORE_PARALLELACTIONSCHEDULER_H
-
-#include
-
-SOFA_HEADER_DISABLED_PARALLELVISITORSCHEDULER()
-
-#endif
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/VisitorScheduler.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/VisitorScheduler.h
deleted file mode 100644
index e92765afa51..00000000000
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/VisitorScheduler.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#ifndef SOFA_SIMULATION_VISITORSCHEDULER_H
-#define SOFA_SIMULATION_VISITORSCHEDULER_H
-
-#include
-
-SOFA_HEADER_DISABLED_VISITORSCHEDULER()
-
-#endif
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in
index cd2b0bc43f3..a2d7d2e8af2 100644
--- a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in
+++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in
@@ -34,27 +34,6 @@
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_HEADER_DISABLED_VISITORSCHEDULER()
-#else
-#define SOFA_HEADER_DISABLED_VISITORSCHEDULER() \
- SOFA_HEADER_DISABLED_NOT_REPLACED("v23.12", "v24.06")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_HEADER_DISABLED_PARALLELVISITORSCHEDULER()
-#else
-#define SOFA_HEADER_DISABLED_PARALLELVISITORSCHEDULER() \
- SOFA_HEADER_DISABLED_NOT_REPLACED("v23.12", "v24.06")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_HEADER_DISABLED_LOCALSTORAGE()
-#else
-#define SOFA_HEADER_DISABLED_LOCALSTORAGE() \
- SOFA_HEADER_DISABLED_NOT_REPLACED("v23.12", "v24.06")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_RESETSYSTEM()
#else
diff --git a/applications/plugins/MultiThreading/CMakeLists.txt b/applications/plugins/MultiThreading/CMakeLists.txt
index c2dd2803c2a..6a65cb1ffb9 100644
--- a/applications/plugins/MultiThreading/CMakeLists.txt
+++ b/applications/plugins/MultiThreading/CMakeLists.txt
@@ -9,7 +9,6 @@ set(HEADER_FILES
src/MultiThreading/MeanComputation.h
src/MultiThreading/MeanComputation.inl
src/MultiThreading/component/animationloop/AnimationLoopParallelScheduler.h
- src/MultiThreading/component/animationloop/StepTask.h
src/MultiThreading/component/collision/detection/algorithm/ParallelBVHNarrowPhase.h
src/MultiThreading/component/collision/detection/algorithm/ParallelBruteForceBroadPhase.h
src/MultiThreading/component/linearsolver/iterative/ParallelCGLinearSolver.h
diff --git a/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/StepTask.h b/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/StepTask.h
deleted file mode 100644
index d09ae9b4b42..00000000000
--- a/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/StepTask.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-
-#include
-
-SOFA_HEADER_DISABLED_NOT_REPLACED("v23.06", "v23.12")
diff --git a/applications/plugins/SofaCUDA/CMakeLists.txt b/applications/plugins/SofaCUDA/CMakeLists.txt
index ed1cb7f93d0..194ce7886dc 100644
--- a/applications/plugins/SofaCUDA/CMakeLists.txt
+++ b/applications/plugins/SofaCUDA/CMakeLists.txt
@@ -28,7 +28,6 @@ set(HEADER_FILES
sofa/gpu/cuda/CudaMemoryManager.h
sofa/gpu/cuda/CudaScan.h
sofa/gpu/cuda/CudaSort.h
- sofa/gpu/cuda/CudaTexture.h
sofa/gpu/cuda/CudaTypes.h
sofa/gpu/cuda/mycuda.h
diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTexture.h b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTexture.h
deleted file mode 100644
index 465223bb78e..00000000000
--- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTexture.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#ifndef CUDATEXTURE_H
-#define CUDATEXTURE_H
-
-#include
-SOFA_HEADER_DISABLED_NOT_REPLACED("v23.06", "v23.12")
diff --git a/applications/projects/SceneChecking/CMakeLists.txt b/applications/projects/SceneChecking/CMakeLists.txt
index 3ed18e84519..ced5784c812 100644
--- a/applications/projects/SceneChecking/CMakeLists.txt
+++ b/applications/projects/SceneChecking/CMakeLists.txt
@@ -11,7 +11,6 @@ set(SCENECHECK_SRC_DIR src/SceneChecking)
set(HEADER_FILES
${SCENECHECK_SRC_DIR}/config.h.in
${SCENECHECK_SRC_DIR}/init.h
- ${SCENECHECK_SRC_DIR}/SceneCheck.h
${SCENECHECK_SRC_DIR}/SceneCheckAPIChange.h
${SCENECHECK_SRC_DIR}/SceneCheckCollisionResponse.h
${SCENECHECK_SRC_DIR}/SceneCheckDeprecatedComponents.h
diff --git a/applications/projects/SceneChecking/src/SceneChecking/SceneCheck.h b/applications/projects/SceneChecking/src/SceneChecking/SceneCheck.h
deleted file mode 100644
index c6dbbc590e1..00000000000
--- a/applications/projects/SceneChecking/src/SceneChecking/SceneCheck.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
-* SOFA, Simulation Open-Framework Architecture *
-* (c) 2006 INRIA, USTL, UJF, CNRS, MGH *
-* *
-* This program is free software; you can redistribute it and/or modify it *
-* under the terms of the GNU Lesser General Public License as published by *
-* the Free Software Foundation; either version 2.1 of the License, or (at *
-* your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, but WITHOUT *
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
-* for more details. *
-* *
-* You should have received a copy of the GNU Lesser General Public License *
-* along with this program. If not, see . *
-*******************************************************************************
-* Authors: The SOFA Team and external contributors (see Authors.txt) *
-* *
-* Contact information: contact@sofa-framework.org *
-******************************************************************************/
-#pragma once
-
-#include
-SOFA_HEADER_DISABLED("v23.06", "v23.12", "sofa/simulation/SceneCheck.h")