1.1 --- a/libfsserver/include/fsserver/opener_resource.h	Sun Jul 18 00:47:14 2021 +0200
     1.2 +++ b/libfsserver/include/fsserver/opener_resource.h	Sat Jul 24 18:55:21 2021 +0200
     1.3 @@ -21,22 +21,23 @@
     1.4  
     1.5  #pragma once
     1.6  
     1.7 -#include <l4/sys/ipc.h>
     1.8 -
     1.9 +#include <fsserver/file_opening.h>
    1.10  #include <fsserver/file_paging.h>
    1.11  #include <fsserver/opener_context_resource.h>
    1.12  #include <fsserver/opener_interface.h>
    1.13 -#include <fsserver/pages.h>
    1.14  #include <fsserver/resource.h>
    1.15  
    1.16  
    1.17  
    1.18  /* Support for providing access to files. */
    1.19  
    1.20 -class OpenerResource : public Resource, public FilePaging, public Opener
    1.21 +class OpenerResource : public Resource, public FileOpening, public Opener
    1.22  {
    1.23 +protected:
    1.24 +    FilePaging *_paging;
    1.25 +
    1.26  public:
    1.27 -    explicit OpenerResource(Pages *pages);
    1.28 +    explicit OpenerResource(FilePaging *paging);
    1.29  
    1.30      /* Server details. */
    1.31