diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/CMakeLists.txt b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/CMakeLists.txt
index f8cf8b3810eca53e4b1db05c0e977002b6001515..571b5aca6d3b9eb67f489a292ed1556c35eff347 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/CMakeLists.txt
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: ForwardRegionProperties
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ForwardRegionProperties )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel
-                          PRIVATE
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -20,9 +11,7 @@ atlas_add_component( ForwardRegionProperties
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps ForwardRegionGeoModelLib GaudiKernel )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps ForwardRegionGeoModelLib )
 
 # Install files from the package:
-atlas_install_headers( ForwardRegionProperties )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.cxx
index 5a1eaca554847776c4089c39392d25f52b084d47..6159d66a9f346c195dccc0a507808dc9184b5cdd 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "ForwardRegionProperties/ForwardRegionProperties.h"
+#include "ForwardRegionProperties.h"
 
 ForwardRegionProperties::ForwardRegionProperties( const std::string& type, const std::string& name, const IInterface* parent )
 : base_class( type, name, parent )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/ForwardRegionProperties/ForwardRegionProperties.h b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.h
similarity index 100%
rename from ForwardDetectors/ForwardSimulation/ForwardRegionProperties/ForwardRegionProperties/ForwardRegionProperties.h
rename to ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/ForwardRegionProperties.h
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
index bd1d6a175ddc9eddf0e09d80cdaaf819aadefaf5..140235955ac516c2b352a42c7be14160216adcec 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
@@ -1,4 +1,4 @@
-#include "ForwardRegionProperties/ForwardRegionProperties.h"
+#include "../ForwardRegionProperties.h"
 
 DECLARE_COMPONENT( ForwardRegionProperties )