diff --git a/src/OutputByOrbit.h b/src/OutputByOrbit.h
index be633a39fd77d8f390a5b5a1c7c9faf12f750089..c2c5031a7f91e3e5cf5673515a6e36fc94283c0b 100644
--- a/src/OutputByOrbit.h
+++ b/src/OutputByOrbit.h
@@ -6,9 +6,9 @@
 #include <cstdio>
 #include <string>
 
+#include "OutputFileHandler.h"
 #include "tbb/pipeline.h"
 
-class OutputFileHandler;
 class ctrl;
 class config;
 
@@ -17,21 +17,13 @@ class OutputByOrbitStream : public tbb::filter {
  public:
   OutputByOrbitStream(ctrl &c, config &conf_);
   void *operator()(void *item) /*override*/;
-  void *OutputFixedOrbits(Slice &out);
+  void OutputFixedOrbits(Slice &out);
 
  private:
   // used for fixed N orbits per file approach
-  void close_and_move_file();
-  void open_file(uint32_t index_);
 
-  OutFile outFile;
-
-  std::string my_output_filename_base;
-  std::string my_output_filename_prefix;
-  uint32_t totcounts;
   uint64_t current_file_size;
-  int32_t file_count;
-  uint32_t current_run_number;
+  uint64_t totcounts;
   ctrl &control;
   config &conf;
   OutputFileHandler output_file_handler_;