Use forward declarations

src/animation.h

@@ -26,9 +26,11 @@ Mattext is distributed in the hope that it will be useful,
 #include <unordered_map>
 #include <memory>
 #include <string>
-#include "config.h"
-#include "terminal.h"
-#include "file_reader.h"
+#include <list>
+
+class Text;
+class Config;
+class Terminal;
 
 class Animation {
  public:

src/animation_fire.cpp

@@ -20,6 +20,9 @@ Mattext is distributed in the hope that it will be useful,
 *******************************************************************************/
 
 #include "animation_fire.h"
+#include "terminal.h"
+#include "config.h"
+#include "file_reader.h"
 
 void FireAnimation::init() {
   fire_heights.resize(terminal_width);

src/animation_generic.cpp

@@ -20,6 +20,8 @@ Mattext is distributed in the hope that it will be useful,
 *******************************************************************************/
 
 #include "animation_generic.h"
+#include "terminal.h"
+#include "config.h"
 
 GenericAnimation::GenericAnimation(const Config &config,
                                    const Terminal &terminal)

src/animation_matrix.cpp

@@ -20,14 +20,17 @@ Mattext is distributed in the hope that it will be useful,
 *******************************************************************************/
 
 #include "animation_matrix.h"
+#include "terminal.h"
+#include "config.h"
+#include "file_reader.h"
 
 void MatrixAnimation::init() {
   col_lengths.resize(terminal_width);
   col_offsets.resize(terminal_width);
   tick_id = 0;
 
   if (config.rand_columns_len <= 0) {
-    max_col_length = terminal.getHeight();
+    max_col_length = terminal_height;
   } else {
     max_col_length = config.rand_columns_len;
   }

src/animation_none.cpp

@@ -20,6 +20,8 @@ Mattext is distributed in the hope that it will be useful,
 *******************************************************************************/
 
 #include "animation_none.h"
+#include "terminal.h"
+#include "file_reader.h"
 
 NoneAnimation::NoneAnimation(const Terminal &terminal) : terminal(terminal) {}
 

src/animation_reverse_matrix.cpp

@@ -20,12 +20,15 @@ Mattext is distributed in the hope that it will be useful,
 *******************************************************************************/
 
 #include "animation_reverse_matrix.h"
+#include "terminal.h"
+#include "config.h"
+#include "file_reader.h"
 
 void ReverseMatrixAnimation::tick(ev::timer &w, int revents) {
   int _terminal_height = static_cast<int>(terminal_height);
   bool stopped = true;
 
-  for (size_t col = 0; col < terminal.getWidth(); ++col) {
+  for (size_t col = 0; col < terminal_width; ++col) {
     int col_start = _terminal_height - 1 - tick_id + col_offsets[col];
     int col_end = col_start + col_lengths[col];
     int text_start = col_end + tail_length + 1;

src/file_backward_reader.cpp

@@ -23,6 +23,8 @@ Mattext is distributed in the hope that it will be useful,
 #include <stdexcept>
 #include <string.h>
 #include "file_backward_reader.h"
+#include "config.h"
+#include "file_io.h"
 
 BackwardReader::BackwardReader(std::vector<std::vector<wchar_t>> &lines,
                                std::vector<size_t> &line_lens,

src/file_backward_reader.h

@@ -23,7 +23,8 @@ Mattext is distributed in the hope that it will be useful,
 
 #include <vector>
 #include "file_reader_logic.h"
-#include "config.h"
+
+class Config;
 
 class BackwardReader : public FileReaderLogic {
  public:

src/file_forward_reader.cpp

@@ -23,6 +23,8 @@ Mattext is distributed in the hope that it will be useful,
 #include <stdexcept>
 #include <string.h>
 #include "file_forward_reader.h"
+#include "config.h"
+#include "file_io.h"
 
 ForwardReader::ForwardReader(std::vector<std::vector<wchar_t>> &lines,
                              std::vector<size_t> &line_lens,

src/file_forward_reader.h

@@ -23,7 +23,8 @@ Mattext is distributed in the hope that it will be useful,
 
 #include <vector>
 #include "file_reader_logic.h"
-#include "config.h"
+
+class Config;
 
 class ForwardReader : public FileReaderLogic {
  public:

src/file_reader.cpp

@@ -22,6 +22,8 @@ Mattext is distributed in the hope that it will be useful,
 #include "file_reader.h"
 #include "file_forward_reader.h"
 #include "file_backward_reader.h"
+#include "config.h"
+#include "terminal.h"
 
 FileReader::FileReader(const Config &config, const Terminal &terminal)
     : terminal(terminal),

src/file_reader.h

@@ -23,11 +23,12 @@ Mattext is distributed in the hope that it will be useful,
 
 #include <vector>
 #include <memory>
-#include "config.h"
-#include "terminal.h"
 #include "file_reader_logic.h"
 #include "file_io.h"
 
+class Terminal;
+class Config;
+
 class Text {
  public:
   virtual wchar_t get(size_t column, size_t row) const = 0;

src/file_reader_logic.h

@@ -22,7 +22,8 @@ Mattext is distributed in the hope that it will be useful,
 #pragma once
 
 #include <string>
-#include "file_io.h"
+
+class FileIO;
 
 class FileReaderLogic {
  public:

src/file_stream.cpp

@@ -24,6 +24,8 @@ Mattext is distributed in the hope that it will be useful,
 #include <unistd.h>
 #include <sstream>
 #include "file_stream.h"
+#include "config.h"
+#include "terminal.h"
 
 FileStream::FileStream(const Config &config, const Terminal &terminal)
     : config(config), terminal(terminal), file_reader(config, terminal) {

src/file_stream.h

@@ -24,11 +24,12 @@ Mattext is distributed in the hope that it will be useful,
 #include <list>
 #include <functional>
 #include <ev++.h>
-#include "config.h"
-#include "terminal.h"
 #include "file_reader.h"
 #include "file_io.h"
 
+class Terminal;
+class Config;
+
 class FileStream {
  public:
   FileStream(const Config &config, const Terminal &terminal);

src/manager_interactive.cpp

@@ -25,6 +25,9 @@ Mattext is distributed in the hope that it will be useful,
 #include <ev++.h>
 #include <ncurses.h>
 #include "manager_interactive.h"
+#include "config.h"
+#include "file_stream.h"
+#include "terminal.h"
 
 ManagerInteractive::ManagerInteractive(const Config &config,
                                        FileStream &file_stream,

src/manager_interactive.h

@@ -21,12 +21,13 @@ Mattext is distributed in the hope that it will be useful,
 
 #pragma once
 
-#include "config.h"
-#include "file_stream.h"
-#include "terminal.h"
 #include "animation.h"
 #include "manager.h"
 
+class Config;
+class Terminal;
+class FileStream;
+
 class ManagerInteractive : public Manager {
  public:
   ManagerInteractive(const Config &config, FileStream &file_stream,

src/manager_plain.cpp

@@ -25,6 +25,7 @@ Mattext is distributed in the hope that it will be useful,
 #include <ev++.h>
 #include <string.h>
 #include "manager_plain.h"
+#include "file_stream.h"
 
 ManagerPlain::ManagerPlain(FileStream &file_stream) : file_stream(file_stream) {
   read();

src/manager_plain.h

@@ -21,11 +21,10 @@ Mattext is distributed in the hope that it will be useful,
 
 #pragma once
 
-#include "config.h"
-#include "file_stream.h"
-#include "terminal.h"
 #include "manager.h"
 
+class FileStream;
+
 class ManagerPlain : public Manager {
  public:
   ManagerPlain(FileStream &file_stream);

src/terminal.cpp

@@ -30,6 +30,7 @@ Mattext is distributed in the hope that it will be useful,
 #include <string.h>
 #include <fcntl.h>
 #include "terminal.h"
+#include "config.h"
 
 Terminal::Terminal(const Config &config)
     : colors{COLOR_BLACK, COLOR_RED,     COLOR_GREEN, COLOR_YELLOW,

src/terminal.h

@@ -26,7 +26,8 @@ Mattext is distributed in the hope that it will be useful,
 #include <functional>
 #include <unistd.h>
 #include <ev++.h>
-#include "config.h"
+
+class Config;
 
 enum Colors {
   ColorDefault = -1,