source tree cleanup

The lib/ directory was getting a bit out of hand, so this tries
to organize things a bit so it is easier going forward to locate
the code people want to patch.

lib/callgraph/sp-callgraph-profile-private.h

@@ -19,8 +19,8 @@
 #ifndef SP_CALLGRAPH_PROFILE_PRIVATE_H
 #define SP_CALLGRAPH_PROFILE_PRIVATE_H
 
-#include "sp-callgraph-profile.h"
+#include "callgraph/sp-callgraph-profile.h"
-#include "stackstash.h"
+#include "util/stackstash.h"
 
 G_BEGIN_DECLS
 

lib/callgraph/sp-callgraph-profile.c

@@ -39,16 +39,16 @@
 #include <unistd.h>
 
 #include "sp-address.h"
-#include "sp-callgraph-profile.h"
+#include "callgraph/sp-callgraph-profile.h"
-#include "sp-callgraph-profile-private.h"
+#include "callgraph/sp-callgraph-profile-private.h"
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-elf-symbol-resolver.h"
+#include "symbols/sp-elf-symbol-resolver.h"
-#include "sp-jitmap-symbol-resolver.h"
+#include "symbols/sp-jitmap-symbol-resolver.h"
-#include "sp-map-lookaside.h"
+#include "util/sp-map-lookaside.h"
-#include "sp-kernel-symbol-resolver.h"
+#include "symbols/sp-kernel-symbol-resolver.h"
-#include "sp-selection.h"
+#include "util/sp-selection.h"
 
-#include "stackstash.h"
+#include "util/stackstash.h"
 
 #define CHECK_CANCELLABLE_INTERVAL 100
 

lib/callgraph/sp-callgraph-profile.h

@@ -19,8 +19,8 @@
 #ifndef SP_CALLGRAPH_PROFILE_H
 #define SP_CALLGRAPH_PROFILE_H
 
-#include "sp-profile.h"
+#include "profiler/sp-profile.h"
-#include "sp-selection.h"
+#include "util/sp-selection.h"
 
 G_BEGIN_DECLS
 

lib/callgraph/sp-callgraph-view.c

@@ -37,9 +37,9 @@
 
 #include <glib/gi18n.h>
 
-#include "sp-callgraph-profile-private.h"
+#include "callgraph/sp-callgraph-profile-private.h"
-#include "sp-callgraph-view.h"
+#include "callgraph/sp-callgraph-view.h"
-#include "sp-cell-renderer-percent.h"
+#include "widgets/sp-cell-renderer-percent.h"
 
 typedef struct
 {

lib/callgraph/sp-callgraph-view.h

@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-callgraph-profile.h"
+#include "callgraph/sp-callgraph-profile.h"
 
 G_BEGIN_DECLS
 

lib/capture/sp-capture-condition.c

@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "sp-capture-condition.h"
+#include "capture/sp-capture-condition.h"
 
 /**
  * SECTION:sp-capture-condition

lib/capture/sp-capture-condition.h

@@ -19,7 +19,7 @@
 #ifndef SP_CAPTURE_CONDITION_H
 #define SP_CAPTURE_CONDITION_H
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/capture/sp-capture-cursor.c

@@ -18,9 +18,9 @@
 
 #define G_LOG_DOMAIN "sp-capture-cursor"
 
-#include "sp-capture-condition.h"
+#include "capture/sp-capture-condition.h"
-#include "sp-capture-cursor.h"
+#include "capture/sp-capture-cursor.h"
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
 
 #define READ_DELEGATE(f) ((ReadDelegate)(f))
 

lib/capture/sp-capture-cursor.h

@@ -19,7 +19,7 @@
 #ifndef SP_CAPTURE_CURSOR_H
 #define SP_CAPTURE_CURSOR_H
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/capture/sp-capture-reader.c

@@ -24,8 +24,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-capture-writer.h"
+#include "capture/sp-capture-writer.h"
 
 struct _SpCaptureReader
 {

lib/capture/sp-capture-reader.h

@@ -19,7 +19,7 @@
 #ifndef SP_CAPTURE_READER_H
 #define SP_CAPTURE_READER_H
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/capture/sp-capture-writer.c

@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-capture-writer.h"
+#include "capture/sp-capture-writer.h"
 
 #define DEFAULT_BUFFER_SIZE (getpagesize() * 64L)
 #define INVALID_ADDRESS     (G_GUINT64_CONSTANT(0))

lib/capture/sp-capture-writer.h

@@ -19,7 +19,7 @@
 #ifndef SP_CAPTURE_WRITER_H
 #define SP_CAPTURE_WRITER_H
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/meson.build

@@ -1,44 +1,4 @@
 
-# Both the profiler library and the UI library need to share some
-# data-structures. Notably, the StackStash. So we build a private
-# static library that can be used from both. It adds a little bit
-# of overhead in terms of duplicated procedures, but they should
-# always be installed in sync, and therefore no big deal.
-
-libutil_sources = [
-  'util/binfile.c',
-  'util/binfile.h',
-  'util/demangle.cpp',
-  'util/demangle.h',
-  'util/elfparser.c',
-  'util/elfparser.h',
-  'util/pointcache.c',
-  'util/pointcache.h',
-  'util/stackstash.c',
-  'util/stackstash.h',
-]
-
-libutil_deps = [
-  dependency('gio-unix-2.0', version: '>=2.44.0')
-]
-
-libutil_includes = [
-  'util',
-]
-
-libutil = static_library('util',
-  libutil_sources,
-  include_directories: include_directories(libutil_includes),
-  dependencies: libutil_deps,
-  pic: true,
-)
-
-libutil_dep = declare_dependency(
-  link_with: libutil,
-  dependencies: libutil_deps,
-  include_directories: include_directories(libutil_includes),
-)
-
 # We split up the library code into two libraries.  One containing the
 # minimum necessary to do profiling on a particular host (that might not
 # have GTK+ installed), and the library containing reusable GTK
@@ -54,82 +14,89 @@ libsysprof_version_conf.set('MICRO_VERSION', libsysprof_version[2])
 libsysprof_version_conf.set('VERSION', meson.project_version())
 
 configure_file(
-  input: 'sysprof-version.h.in',
+          input: 'sysprof-version.h.in',
-  output: 'sysprof-version.h',
+         output: 'sysprof-version.h',
   configuration: libsysprof_version_conf,
-  install: true,
+        install: true,
-  install_dir: join_paths(get_option('includedir'),
+    install_dir: join_paths(get_option('includedir'), 'sysprof-' + libsysprof_api_version)
-                          'sysprof-' + libsysprof_api_version)
 )
 
 libsysprof_headers = [
   'sysprof.h',
   'sp-address.h',
-  'sp-callgraph-profile.h',
-  'sp-capture-condition.h',
-  'sp-capture-cursor.h',
-  'sp-capture-reader.h',
-  'sp-capture-writer.h',
-  'sp-capture-types.h',
   'sp-clock.h',
-  'sp-elf-symbol-resolver.h',
   'sp-error.h',
-  'sp-gjs-source.h',
+  'callgraph/sp-callgraph-profile.h',
-  'sp-hostinfo-source.h',
+  'capture/sp-capture-condition.h',
-  'sp-jitmap-symbol-resolver.h',
+  'capture/sp-capture-cursor.h',
-  'sp-kernel-symbol.h',
+  'capture/sp-capture-reader.h',
-  'sp-kernel-symbol-resolver.h',
+  'capture/sp-capture-types.h',
-  'sp-local-profiler.h',
+  'capture/sp-capture-writer.h',
-  'sp-map-lookaside.h',
+  'profiler/sp-local-profiler.h',
-  'sp-perf-source.h',
+  'profiler/sp-profile.h',
-  'sp-proc-source.h',
+  'profiler/sp-profiler.h',
-  'sp-profile.h',
+  'sources/sp-gjs-source.h',
-  'sp-profiler.h',
+  'sources/sp-hostinfo-source.h',
-  'sp-selection.h',
+  'sources/sp-perf-source.h',
-  'sp-source.h',
+  'sources/sp-proc-source.h',
-  'sp-symbol-dirs.h',
+  'sources/sp-source.h',
-  'sp-symbol-resolver.h',
+  'symbols/sp-elf-symbol-resolver.h',
+  'symbols/sp-jitmap-symbol-resolver.h',
+  'symbols/sp-kernel-symbol-resolver.h',
+  'symbols/sp-kernel-symbol.h',
+  'symbols/sp-symbol-dirs.h',
+  'symbols/sp-symbol-resolver.h',
+  'util/sp-map-lookaside.h',
+  'util/sp-selection.h',
 ]
 
 libsysprof_sources = [
   'sp-address.c',
-  'sp-callgraph-profile.c',
-  'sp-callgraph-profile-private.h',
-  'sp-capture-condition.c',
-  'sp-capture-cursor.c',
-  'sp-capture-reader.c',
-  'sp-capture-writer.c',
   'sp-clock.c',
-  'sp-elf-symbol-resolver.c',
   'sp-error.c',
-  'sp-gjs-source.c',
+  'callgraph/sp-callgraph-profile-private.h',
-  'sp-hostinfo-source.c',
+  'callgraph/sp-callgraph-profile.c',
-  'sp-jitmap-symbol-resolver.c',
+  'capture/sp-capture-condition.c',
-  'sp-kernel-symbol.c',
+  'capture/sp-capture-cursor.c',
-  'sp-kernel-symbol-resolver.c',
+  'capture/sp-capture-reader.c',
-  'sp-line-reader.c',
+  'capture/sp-capture-writer.c',
-  'sp-line-reader.h',
+  'profiler/sp-local-profiler.c',
-  'sp-local-profiler.c',
+  'profiler/sp-profile.c',
-  'sp-map-lookaside.c',
+  'profiler/sp-profiler.c',
-  'sp-perf-counter.c',
+  'sources/sp-gjs-source.c',
-  'sp-perf-counter.h',
+  'sources/sp-hostinfo-source.c',
-  'sp-perf-source.c',
+  'sources/sp-perf-counter.c',
-  'sp-platform.c',
+  'sources/sp-perf-counter.h',
-  'sp-platform.h',
+  'sources/sp-perf-source.c',
-  'sp-proc-source.c',
+  'sources/sp-proc-source.c',
-  'sp-profile.c',
+  'sources/sp-source.c',
-  'sp-profiler.c',
+  'symbols/sp-elf-symbol-resolver.c',
-  'sp-selection.c',
+  'symbols/sp-jitmap-symbol-resolver.c',
-  'sp-source.c',
+  'symbols/sp-kernel-symbol-resolver.c',
-  'sp-symbol-dirs.c',
+  'symbols/sp-kernel-symbol.c',
-  'sp-symbol-resolver.c',
+  'symbols/sp-symbol-dirs.c',
+  'symbols/sp-symbol-resolver.c',
+  'util/binfile.c',
+  'util/binfile.h',
+  'util/demangle.cpp',
+  'util/demangle.h',
+  'util/elfparser.c',
+  'util/elfparser.h',
+  'util/sp-line-reader.c',
+  'util/sp-line-reader.h',
+  'util/sp-map-lookaside.c',
+  'util/sp-platform.c',
+  'util/sp-platform.h',
+  'util/sp-selection.c',
+  'util/stackstash.c',
+  'util/stackstash.h',
 ]
 
 cxx = meson.get_compiler('cpp')
 
 libsysprof_deps = [
-  libutil_dep,
   cxx.find_library('stdc++'),
+  dependency('gio-unix-2.0'),
 ]
 
 version_link_arg = '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'sysprof.map')
@@ -143,10 +110,10 @@ endif
 libsysprof = shared_library('sysprof-' + libsysprof_api_version,
   libsysprof_sources,
   dependencies: libsysprof_deps,
-  c_args: libsysprof_c_args,
+        c_args: libsysprof_c_args,
-  link_args: version_link_arg,
+     link_args: version_link_arg,
   link_depends: 'sysprof.map',
-  install: true,
+       install: true,
 )
 
 install_headers(libsysprof_headers,
@@ -155,7 +122,7 @@ install_headers(libsysprof_headers,
 
 libsysprof_dep = declare_dependency(
   include_directories: include_directories('.'),
-  link_with: libsysprof,
+     link_with: libsysprof,
   dependencies: libsysprof_deps,
 )
 
@@ -165,70 +132,74 @@ if get_option('enable_gtk')
   # meant to be used by IDEs and the sysprof gui.
 
   libsysprof_ui_headers = [
-    'sp-callgraph-view.h',
+    'callgraph/sp-callgraph-view.h',
-    'sp-cell-renderer-percent.h',
+    'util/sp-model-filter.h',
-    'sp-cpu-visualizer-row.h',
+    'util/sp-process-model-item.h',
-    'sp-empty-state-view.h',
+    'util/sp-process-model.h',
-    'sp-failed-state-view.h',
+    'util/sp-zoom-manager.h',
-    'sp-line-visualizer-row.h',
+    'visualizers/sp-cpu-visualizer-row.h',
-    'sp-model-filter.h',
+    'visualizers/sp-line-visualizer-row.h',
-    'sp-multi-paned.h',
+    'visualizers/sp-visualizer-row.h',
-    'sp-process-model.h',
+    'visualizers/sp-visualizer-view.h',
-    'sp-process-model-item.h',
+    'widgets/sp-cell-renderer-percent.h',
-    'sp-process-model-row.h',
+    'widgets/sp-empty-state-view.h',
-    'sp-profiler-menu-button.h',
+    'widgets/sp-failed-state-view.h',
-    'sp-recording-state-view.h',
+    'widgets/sp-multi-paned.h',
-    'sp-visualizer-row.h',
+    'widgets/sp-process-model-row.h',
-    'sp-visualizer-view.h',
+    'widgets/sp-profiler-menu-button.h',
-    'sp-zoom-manager.h',
+    'widgets/sp-recording-state-view.h',
     'sysprof-ui.h',
   ]
 
   libsysprof_ui_sources = [
-    'sp-callgraph-view.c',
+    'callgraph/sp-callgraph-view.c',
-    'sp-cell-renderer-percent.c',
+    'util/pointcache.c',
-    'sp-color-cycle.c',
+    'util/pointcache.h',
-    'sp-color-cycle.h',
+    'util/sp-color-cycle.c',
-    'sp-cpu-visualizer-row.c',
+    'util/sp-color-cycle.h',
-    'sp-empty-state-view.c',
+    'util/sp-model-filter.c',
-    'sp-failed-state-view.c',
+    'util/sp-process-model-item.c',
-    'sp-line-visualizer-row.c',
+    'util/sp-process-model.c',
-    'sp-model-filter.c',
+    'util/sp-theme-manager.c',
-    'sp-multi-paned.c',
+    'util/sp-theme-manager.h',
-    'sp-process-model.c',
+    'util/sp-zoom-manager.c',
-    'sp-process-model-item.c',
+    'util/stackstash.c',
-    'sp-process-model-row.c',
+    'util/stackstash.h',
-    'sp-profiler-menu-button.c',
+    'visualizers/sp-cpu-visualizer-row.c',
-    'sp-recording-state-view.c',
+    'visualizers/sp-line-visualizer-row.c',
-    'sp-theme-manager.c',
+    'visualizers/sp-visualizer-list.c',
-    'sp-theme-manager.h',
+    'visualizers/sp-visualizer-list.h',
-    'sp-visualizer-list.c',
+    'visualizers/sp-visualizer-row-private.h',
-    'sp-visualizer-list.h',
+    'visualizers/sp-visualizer-row.c',
-    'sp-visualizer-row.c',
+    'visualizers/sp-visualizer-ticks.c',
-    'sp-visualizer-row-private.h',
+    'visualizers/sp-visualizer-ticks.h',
-    'sp-visualizer-ticks.c',
+    'visualizers/sp-visualizer-view.c',
-    'sp-visualizer-ticks.h',
+    'widgets/sp-cell-renderer-percent.c',
-    'sp-visualizer-view.c',
+    'widgets/sp-empty-state-view.c',
-    'sp-zoom-manager.c',
+    'widgets/sp-failed-state-view.c',
+    'widgets/sp-multi-paned.c',
+    'widgets/sp-process-model-row.c',
+    'widgets/sp-profiler-menu-button.c',
+    'widgets/sp-recording-state-view.c',
   ]
 
   libsysprof_ui_resources = gnome.compile_resources(
     'sp-ui-resources', 'resources/libsysprof.gresource.xml',
     source_dir: 'resources',
-    c_name: 'sp',
+        c_name: 'sp',
   )
 
   libsysprof_ui_deps = [
     libsysprof_dep,
-    dependency('gtk+-3.0', version: '>=3.21.5'),
+    dependency('gtk+-3.0', version: '>=3.22.0'),
   ]
 
   libsysprof_ui = shared_library('sysprof-ui-' + libsysprof_api_version,
     libsysprof_ui_resources + libsysprof_ui_sources,
     dependencies: libsysprof_ui_deps,
-    link_args: version_link_arg,
+       link_args: version_link_arg,
     link_depends: 'sysprof.map',
-    install: true,
+         install: true,
   )
 
   install_headers(libsysprof_ui_headers,
@@ -236,8 +207,8 @@ if get_option('enable_gtk')
   )
 
   libsysprof_ui_dep = declare_dependency(
-    dependencies: libsysprof_ui_deps,
+           dependencies: libsysprof_ui_deps,
-    link_with: libsysprof_ui,
+              link_with: libsysprof_ui,
     include_directories: include_directories('.'),
   )
 

lib/profiler/sp-local-profiler.c

@@ -21,8 +21,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "sp-local-profiler.h"
+#include "profiler/sp-local-profiler.h"
-#include "sp-platform.h"
+#include "util/sp-platform.h"
 
 typedef struct
 {

lib/profiler/sp-local-profiler.h

@@ -19,7 +19,7 @@
 #ifndef SP_LOCAL_PROFILER_H
 #define SP_LOCAL_PROFILER_H
 
-#include "sp-profiler.h"
+#include "profiler/sp-profiler.h"
 
 G_BEGIN_DECLS
 

lib/profiler/sp-profile.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-profile.h"
+#include "profiler/sp-profile.h"
 
 G_DEFINE_INTERFACE (SpProfile, sp_profile, G_TYPE_OBJECT)
 

lib/profiler/sp-profile.h

@@ -21,7 +21,7 @@
 
 #include <gio/gio.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
 
 G_BEGIN_DECLS
 

lib/profiler/sp-profiler.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-profiler.h"
+#include "profiler/sp-profiler.h"
 
 G_DEFINE_INTERFACE (SpProfiler, sp_profiler, G_TYPE_OBJECT)
 

lib/profiler/sp-profiler.h

@@ -19,8 +19,8 @@
 #ifndef SP_PROFILER_H
 #define SP_PROFILER_H
 
-#include "sp-capture-writer.h"
+#include "capture/sp-capture-writer.h"
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_BEGIN_DECLS
 

lib/sources/sp-gjs-source.c

@@ -19,8 +19,8 @@
 #include <signal.h>
 #include <string.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-gjs-source.h"
+#include "sources/sp-gjs-source.h"
 
 struct _SpGjsSource
 {

lib/sources/sp-gjs-source.h

@@ -19,7 +19,7 @@
 #ifndef SP_GJS_SOURCE_H
 #define SP_GJS_SOURCE_H
 
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_BEGIN_DECLS
 

lib/sources/sp-hostinfo-source.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "sp-hostinfo-source.h"
+#include "sources/sp-hostinfo-source.h"
 
 struct _SpHostinfoSource
 {

lib/sources/sp-hostinfo-source.h

@@ -19,7 +19,7 @@
 #ifndef SP_HOSTINFO_SOURCE_H
 #define SP_HOSTINFO_SOURCE_H
 
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_BEGIN_DECLS
 

lib/sources/sp-perf-counter.c

@@ -53,7 +53,7 @@
 # include <polkit/polkit.h>
 #endif
 
-#include "sp-perf-counter.h"
+#include "sources/sp-perf-counter.h"
 
 /*
  * Number of pages to map for the ring buffer.  We map one additional buffer

lib/sources/sp-perf-source.c

@@ -47,9 +47,9 @@
 #include <unistd.h>
 
 #include "sp-clock.h"
-#include "sp-line-reader.h"
+#include "util/sp-line-reader.h"
-#include "sp-perf-counter.h"
+#include "sources/sp-perf-counter.h"
-#include "sp-perf-source.h"
+#include "sources/sp-perf-source.h"
 
 #define N_WAKEUP_EVENTS 149
 

lib/sources/sp-perf-source.h

@@ -19,7 +19,7 @@
 #ifndef SP_PERF_SOURCE_H
 #define SP_PERF_SOURCE_H
 
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_BEGIN_DECLS
 

lib/sources/sp-proc-source.c

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sp-proc-source.h"
+#include "sources/sp-proc-source.h"
 
 struct _SpProcSource
 {

lib/sources/sp-proc-source.h

@@ -19,7 +19,7 @@
 #ifndef SP_PROC_SOURCE_H
 #define SP_PROC_SOURCE_H
 
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_BEGIN_DECLS
 

lib/sources/sp-source.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-source.h"
+#include "sources/sp-source.h"
 
 G_DEFINE_INTERFACE (SpSource, sp_source, G_TYPE_OBJECT)
 

lib/sources/sp-source.h

@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include "sp-capture-writer.h"
+#include "capture/sp-capture-writer.h"
 
 G_BEGIN_DECLS
 

lib/symbols/sp-elf-symbol-resolver.c

@@ -18,11 +18,10 @@
 
 #include <string.h>
 
-#include "binfile.h"
+#include "symbols/sp-elf-symbol-resolver.h"
-#include "elfparser.h"
+#include "util/binfile.h"
-
+#include "util/elfparser.h"
-#include "sp-map-lookaside.h"
+#include "util/sp-map-lookaside.h"
-#include "sp-elf-symbol-resolver.h"
 
 struct _SpElfSymbolResolver
 {

lib/symbols/sp-elf-symbol-resolver.h

@@ -19,7 +19,7 @@
 #ifndef SP_ELF_SYMBOL_RESOLVER_H
 #define SP_ELF_SYMBOL_RESOLVER_H
 
-#include "sp-symbol-resolver.h"
+#include "symbols/sp-symbol-resolver.h"
 
 G_BEGIN_DECLS
 

lib/symbols/sp-jitmap-symbol-resolver.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-kernel-symbol.h"
+#include "symbols/sp-kernel-symbol.h"
-#include "sp-jitmap-symbol-resolver.h"
+#include "symbols/sp-jitmap-symbol-resolver.h"
 
 struct _SpJitmapSymbolResolver
 {

lib/symbols/sp-jitmap-symbol-resolver.h

@@ -19,7 +19,7 @@
 #ifndef SP_JITMAP_SYMBOL_RESOLVER_H
 #define SP_JITMAP_SYMBOL_RESOLVER_H
 
-#include "sp-symbol-resolver.h"
+#include "symbols/sp-symbol-resolver.h"
 
 G_BEGIN_DECLS
 

lib/symbols/sp-kernel-symbol-resolver.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-kernel-symbol.h"
+#include "symbols/sp-kernel-symbol.h"
-#include "sp-kernel-symbol-resolver.h"
+#include "symbols/sp-kernel-symbol-resolver.h"
 
 struct _SpKernelSymbolResolver
 {

lib/symbols/sp-kernel-symbol-resolver.h

@@ -19,7 +19,7 @@
 #ifndef SP_KERNEL_SYMBOL_RESOLVER_H
 #define SP_KERNEL_SYMBOL_RESOLVER_H
 
-#include "sp-symbol-resolver.h"
+#include "symbols/sp-symbol-resolver.h"
 
 G_BEGIN_DECLS
 

lib/symbols/sp-kernel-symbol.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-line-reader.h"
+#include "util/sp-line-reader.h"
-#include "sp-kernel-symbol.h"
+#include "symbols/sp-kernel-symbol.h"
 
 static GArray *kernel_symbols;
 static const gchar *kernel_symbols_skip[] = {

lib/symbols/sp-kernel-symbol.h

@@ -19,7 +19,7 @@
 #ifndef SP_KERNEL_SYMBOL_H
 #define SP_KERNEL_SYMBOL_H
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/symbols/sp-symbol-dirs.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "sp-symbol-dirs.h"
+#include "symbols/sp-symbol-dirs.h"
 
 static GPtrArray *sp_symbol_dirs;
 

lib/symbols/sp-symbol-resolver.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-symbol-resolver.h"
+#include "symbols/sp-symbol-resolver.h"
 
 G_DEFINE_INTERFACE (SpSymbolResolver, sp_symbol_resolver, G_TYPE_OBJECT)
 

lib/symbols/sp-symbol-resolver.h

@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
 
 G_BEGIN_DECLS
 

lib/sysprof-ui.h

@@ -24,22 +24,22 @@
 G_BEGIN_DECLS
 
 #define SYSPROF_INSIDE
-# include "sp-callgraph-view.h"
+# include "callgraph/sp-callgraph-view.h"
-# include "sp-cell-renderer-percent.h"
+# include "widgets/sp-cell-renderer-percent.h"
-# include "sp-cpu-visualizer-row.h"
+# include "visualizers/sp-cpu-visualizer-row.h"
-# include "sp-failed-state-view.h"
+# include "widgets/sp-failed-state-view.h"
-# include "sp-line-visualizer-row.h"
+# include "visualizers/sp-line-visualizer-row.h"
-# include "sp-empty-state-view.h"
+# include "widgets/sp-empty-state-view.h"
-# include "sp-model-filter.h"
+# include "util/sp-model-filter.h"
-# include "sp-multi-paned.h"
+# include "widgets/sp-multi-paned.h"
-# include "sp-recording-state-view.h"
+# include "widgets/sp-recording-state-view.h"
-# include "sp-process-model.h"
+# include "util/sp-process-model.h"
-# include "sp-process-model-item.h"
+# include "util/sp-process-model-item.h"
-# include "sp-process-model-row.h"
+# include "widgets/sp-process-model-row.h"
-# include "sp-profiler-menu-button.h"
+# include "widgets/sp-profiler-menu-button.h"
-# include "sp-visualizer-row.h"
+# include "visualizers/sp-visualizer-row.h"
-# include "sp-visualizer-view.h"
+# include "visualizers/sp-visualizer-view.h"
-# include "sp-zoom-manager.h"
+# include "util/sp-zoom-manager.h"
 #undef SYSPROF_INSIDE
 
 G_END_DECLS

lib/sysprof.h

@@ -24,31 +24,39 @@
 G_BEGIN_DECLS
 
 #define SYSPROF_INSIDE
+
 # include "sp-address.h"
-# include "sp-callgraph-profile.h"
-# include "sp-capture-condition.h"
-# include "sp-capture-cursor.h"
-# include "sp-capture-reader.h"
-# include "sp-capture-writer.h"
 # include "sp-clock.h"
-# include "sp-elf-symbol-resolver.h"
 # include "sp-error.h"
-# include "sp-gjs-source.h"
-# include "sp-hostinfo-source.h"
-# include "sp-jitmap-symbol-resolver.h"
-# include "sp-kernel-symbol-resolver.h"
-# include "sp-kernel-symbol.h"
-# include "sp-local-profiler.h"
-# include "sp-map-lookaside.h"
-# include "sp-perf-source.h"
-# include "sp-proc-source.h"
-# include "sp-profile.h"
-# include "sp-profiler.h"
-# include "sp-selection.h"
-# include "sp-source.h"
-# include "sp-symbol-dirs.h"
-# include "sp-symbol-resolver.h"
 # include "sysprof-version.h"
+
+# include "callgraph/sp-callgraph-profile.h"
+
+# include "capture/sp-capture-condition.h"
+# include "capture/sp-capture-cursor.h"
+# include "capture/sp-capture-reader.h"
+# include "capture/sp-capture-writer.h"
+
+# include "profiler/sp-local-profiler.h"
+# include "profiler/sp-profile.h"
+# include "profiler/sp-profiler.h"
+
+# include "sources/sp-gjs-source.h"
+# include "sources/sp-hostinfo-source.h"
+# include "sources/sp-perf-source.h"
+# include "sources/sp-proc-source.h"
+# include "sources/sp-source.h"
+
+# include "symbols/sp-elf-symbol-resolver.h"
+# include "symbols/sp-jitmap-symbol-resolver.h"
+# include "symbols/sp-kernel-symbol-resolver.h"
+# include "symbols/sp-kernel-symbol.h"
+# include "symbols/sp-symbol-dirs.h"
+# include "symbols/sp-symbol-resolver.h"
+
+# include "util/sp-map-lookaside.h"
+# include "util/sp-selection.h"
+
 #undef SYSPROF_INSIDE
 
 G_END_DECLS

lib/util/binfile.c

@@ -35,10 +35,10 @@
 #include <sys/stat.h>
 #include <stdint.h>
 
-#include "binfile.h"
+#include "util/binfile.h"
-#include "elfparser.h"
+#include "util/elfparser.h"
 
-#include "../sp-symbol-dirs.h"
+#include "symbols/sp-symbol-dirs.h"
 
 struct bin_file_t
 {

lib/util/elfparser.c

@@ -20,8 +20,8 @@
 #include <elf.h>
 #include <sys/mman.h>
 
-#include "demangle.h"
+#include "util/demangle.h"
-#include "elfparser.h"
+#include "util/elfparser.h"
 
 typedef struct Section Section;
 

lib/util/pointcache.c

@@ -18,7 +18,7 @@
 
 #define G_LOG_DOMAIN "pointcache"
 
-#include "pointcache.h"
+#include "util/pointcache.h"
 
 struct _PointCache
 {

lib/util/sp-color-cycle.c

@@ -18,7 +18,7 @@
 
 #define G_LOG_DOMAIN "sp-color-cycle"
 
-#include "sp-color-cycle.h"
+#include "util/sp-color-cycle.h"
 
 G_DEFINE_BOXED_TYPE (SpColorCycle, sp_color_cycle, sp_color_cycle_ref, sp_color_cycle_unref)
 

lib/util/sp-line-reader.c

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "sp-line-reader.h"
+#include "util/sp-line-reader.h"
 
 struct _SpLineReader
 {

lib/util/sp-map-lookaside.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-map-lookaside.h"
+#include "util/sp-map-lookaside.h"
 
 struct _SpMapLookaside
 {

lib/util/sp-map-lookaside.h

@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include "sp-capture-types.h"
+#include "capture/sp-capture-types.h"
 
 G_BEGIN_DECLS
 

lib/util/sp-model-filter.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-model-filter.h"
+#include "util/sp-model-filter.h"
 
 /*
  * This is a simple model filter for GListModel.

lib/util/sp-platform.c

@@ -21,7 +21,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#include "sp-platform.h"
+#include "util/sp-platform.h"
 
 /**
  * sp_memfd_create:

lib/util/sp-process-model-item.c

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "sp-process-model-item.h"
+#include "util/sp-process-model-item.h"
-#include "sp-proc-source.h"
+#include "sources/sp-proc-source.h"
 
 struct _SpProcessModelItem
 {

lib/util/sp-process-model.c

@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 
-#include "sp-process-model.h"
+#include "util/sp-process-model.h"
-#include "sp-process-model-item.h"
+#include "util/sp-process-model-item.h"
 
 #define QUEUE_RELOAD_TIMEOUT_MSEC 100
 

lib/util/sp-selection.c

@@ -18,7 +18,7 @@
 
 #define G_LOG_DOMAIN "sp-selection"
 
-#include "sp-selection.h"
+#include "util/sp-selection.h"
 
 struct _SpSelection
 {

lib/util/sp-theme-manager.c

@@ -18,7 +18,7 @@
 
 #define G_LOG_DOMAIN "sp-theme-manager"
 
-#include "sp-theme-manager.h"
+#include "util/sp-theme-manager.h"
 
 struct _SpThemeManager
 {

lib/util/sp-zoom-manager.c

@@ -21,7 +21,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include "sp-zoom-manager.h"
+#include "util/sp-zoom-manager.h"
 
 struct _SpZoomManager
 {

lib/util/stackstash.c

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "stackstash.h"
+#include "util/stackstash.h"
 
 struct StackStash
 {

lib/visualizers/sp-cpu-visualizer-row.c

@@ -18,10 +18,10 @@
 
 #define G_LOG_DOMAIN "sp-cpu-visualizer-row"
 
-#include "sp-capture-condition.h"
+#include "capture/sp-capture-condition.h"
-#include "sp-capture-cursor.h"
+#include "capture/sp-capture-cursor.h"
-#include "sp-color-cycle.h"
+#include "util/sp-color-cycle.h"
-#include "sp-cpu-visualizer-row.h"
+#include "visualizers/sp-cpu-visualizer-row.h"
 
 struct _SpCpuVisualizerRow
 {

lib/visualizers/sp-cpu-visualizer-row.h

@@ -19,7 +19,7 @@
 #ifndef SP_CPU_VISUALIZER_ROW_H
 #define SP_CPU_VISUALIZER_ROW_H
 
-#include "sp-line-visualizer-row.h"
+#include "visualizers/sp-line-visualizer-row.h"
 
 G_BEGIN_DECLS
 

lib/visualizers/sp-line-visualizer-row.c

@@ -21,10 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "pointcache.h"
+#include "util/pointcache.h"
-#include "sp-capture-condition.h"
+#include "capture/sp-capture-condition.h"
-#include "sp-capture-cursor.h"
+#include "capture/sp-capture-cursor.h"
-#include "sp-line-visualizer-row.h"
+#include "visualizers/sp-line-visualizer-row.h"
 
 typedef struct
 {

lib/visualizers/sp-line-visualizer-row.h

@@ -19,7 +19,7 @@
 #ifndef SP_LINE_VISUALIZER_ROW_H
 #define SP_LINE_VISUALIZER_ROW_H
 
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
 
 G_BEGIN_DECLS
 

lib/visualizers/sp-visualizer-list.c

@@ -20,9 +20,9 @@
 
 #include <glib/gi18n.h>
 
-#include "sp-visualizer-list.h"
+#include "visualizers/sp-visualizer-list.h"
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
-#include "sp-zoom-manager.h"
+#include "util/sp-zoom-manager.h"
 
 #define NSEC_PER_SEC              G_GUINT64_CONSTANT(1000000000)
 #define DEFAULT_PIXELS_PER_SECOND 20

lib/visualizers/sp-visualizer-list.h

@@ -21,8 +21,8 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-zoom-manager.h"
+#include "util/sp-zoom-manager.h"
 
 G_BEGIN_DECLS
 

lib/visualizers/sp-visualizer-row-private.h

@@ -19,7 +19,7 @@
 #ifndef SP_VISUALIZER_ROW_PRIVATE_H
 #define SP_VISUALIZER_ROW_PRIVATE_H
 
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
 
 G_BEGIN_DECLS
 

lib/visualizers/sp-visualizer-row.c

@@ -18,8 +18,8 @@
 
 #define G_LOG_DOMAIN "sp-visualizer-row"
 
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
-#include "sp-visualizer-row-private.h"
+#include "visualizers/sp-visualizer-row-private.h"
 
 #define NSEC_PER_SEC              G_GINT64_CONSTANT(1000000000)
 #define DEFAULT_PIXELS_PER_SECOND 20

lib/visualizers/sp-visualizer-row.h

@@ -21,8 +21,8 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-capture-reader.h"
+#include "capture/sp-capture-reader.h"
-#include "sp-zoom-manager.h"
+#include "util/sp-zoom-manager.h"
 
 G_BEGIN_DECLS
 

lib/visualizers/sp-visualizer-ticks.c

@@ -18,7 +18,7 @@
 
 #include <glib/gi18n.h>
 
-#include "sp-visualizer-ticks.h"
+#include "visualizers/sp-visualizer-ticks.h"
 
 #define NSEC_PER_SEC G_GINT64_CONSTANT(1000000000)
 #define NSEC_PER_HOUR (NSEC_PER_SEC * 60 * 60)

lib/visualizers/sp-visualizer-view.c

@@ -20,13 +20,13 @@
 
 #include <glib/gi18n.h>
 
-#include "sp-theme-manager.h"
+#include "util/sp-theme-manager.h"
-#include "sp-visualizer-list.h"
+#include "visualizers/sp-visualizer-list.h"
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
-#include "sp-visualizer-row-private.h"
+#include "visualizers/sp-visualizer-row-private.h"
-#include "sp-selection.h"
+#include "util/sp-selection.h"
-#include "sp-visualizer-ticks.h"
+#include "visualizers/sp-visualizer-ticks.h"
-#include "sp-visualizer-view.h"
+#include "visualizers/sp-visualizer-view.h"
 
 #define NSEC_PER_SEC G_GINT64_CONSTANT(1000000000)
 #define DEFAULT_PIXELS_PER_SECOND 20

lib/visualizers/sp-visualizer-view.h

@@ -21,9 +21,9 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-visualizer-row.h"
+#include "visualizers/sp-visualizer-row.h"
-#include "sp-selection.h"
+#include "util/sp-selection.h"
-#include "sp-zoom-manager.h"
+#include "util/sp-zoom-manager.h"
 
 G_BEGIN_DECLS
 

lib/widgets/sp-cell-renderer-percent.c

@@ -18,7 +18,7 @@
 
 #include <glib/gi18n.h>
 
-#include "sp-cell-renderer-percent.h"
+#include "widgets/sp-cell-renderer-percent.h"
 
 typedef struct
 {

lib/widgets/sp-empty-state-view.c

@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "sp-empty-state-view.h"
+#include "widgets/sp-empty-state-view.h"
 
 typedef struct
 {

lib/widgets/sp-failed-state-view.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-failed-state-view.h"
+#include "widgets/sp-failed-state-view.h"
 
 G_DEFINE_TYPE (SpFailedStateView, sp_failed_state_view, GTK_TYPE_BIN)
 

lib/widgets/sp-failed-state-view.h

@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-profiler.h"
+#include "profiler/sp-profiler.h"
 
 G_BEGIN_DECLS
 

lib/widgets/sp-multi-paned.c

@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "sp-multi-paned.h"
+#include "widgets/sp-multi-paned.h"
 
 #define HANDLE_WIDTH  10
 #define HANDLE_HEIGHT 10

lib/widgets/sp-process-model-row.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-process-model-row.h"
+#include "widgets/sp-process-model-row.h"
 
 typedef struct
 {

lib/widgets/sp-process-model-row.h

@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-process-model-item.h"
+#include "util/sp-process-model-item.h"
 
 G_BEGIN_DECLS
 

lib/widgets/sp-profiler-menu-button.c

@@ -19,11 +19,11 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include "sp-model-filter.h"
+#include "util/sp-model-filter.h"
-#include "sp-process-model.h"
+#include "util/sp-process-model.h"
-#include "sp-process-model-item.h"
+#include "util/sp-process-model-item.h"
-#include "sp-process-model-row.h"
+#include "widgets/sp-process-model-row.h"
-#include "sp-profiler-menu-button.h"
+#include "widgets/sp-profiler-menu-button.h"
 
 typedef struct
 {

lib/widgets/sp-profiler-menu-button.h

@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-profiler.h"
+#include "profiler/sp-profiler.h"
 
 G_BEGIN_DECLS
 

lib/widgets/sp-recording-state-view.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sp-recording-state-view.h"
+#include "widgets/sp-recording-state-view.h"
 
 typedef struct
 {

lib/widgets/sp-recording-state-view.h

@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sp-profiler.h"
+#include "profiler/sp-profiler.h"
 
 G_BEGIN_DECLS
 

src/sp-window.c

@@ -23,11 +23,12 @@
 #include <sysprof-ui.h>
 
 #include "sp-application.h"
-#include "sp-multi-paned.h"
-#include "sp-visualizer-view.h"
 #include "sp-window.h"
 #include "sp-window-settings.h"
 
+#include "widgets/sp-multi-paned.h"
+#include "visualizers/sp-visualizer-view.h"
+
 struct _SpWindow
 {
   GtkApplicationWindow  parent_instance;

tests/test-capture.c

@@ -17,9 +17,7 @@
  */
 
 #include <glib/gstdio.h>
-
+#include <sysprof.h>
-#include "sp-capture-reader.h"
-#include "sp-capture-writer.h"
 
 static void
 test_reader_basic (void)