Merge remote-tracking branch 'github/merge-requests/451'

* github/merge-requests/451:
  Move pan-view components to their own subdir.
  Update the automake file with new headers
  Refactor pan-types.h into discrete header files for each pan-view code module
  Fix errors in -Werror (except GdkPixbuf deprecation warnings)

diff --cc src/rcfile.c
Simple merge

diff --cc src/view_file.c
index da40981,3f424ca..2472594
--- 1/src/view_file.c
--- 2/src/view_file.c
+++ b/src/view_file.c
@@@ -21,7 -21,8 +21,9 @@@
  #include "main.h"
  #include "view_file.h"
  
 +#include "dupe.h"
+ #include "collect.h"
+ #include "collect-table.h"
  #include "editors.h"
  #include "layout.h"
  #include "menu.h"