From: Uwe Hermann <redacted>
Date: Thu, 21 May 2020 21:35:45 +0000 (+0200)
Subject: Fix a few #include guard inconsistencies.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8845be3c9c7d5aca02fb2efc4038f4735a5242d6;p=pulseview.git

Fix a few #include guard inconsistencies.
---

diff --git a/pv/binding/inputoutput.hpp b/pv/binding/inputoutput.hpp
index acfb61cb..c77313aa 100644
--- a/pv/binding/inputoutput.hpp
+++ b/pv/binding/inputoutput.hpp
@@ -81,4 +81,4 @@ private:
 }  // namespace binding
 }  // namespace pv
 
-#endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_H
+#endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_HPP
diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index 717206a4..aab5119c 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
-#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#ifndef PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
 
 #include <cstdint>
 #include <vector>
@@ -80,4 +80,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#endif // PULSEVIEW_PV_DATA_DECODE_ANNOTATION_HPP
diff --git a/pv/devices/inputfile.hpp b/pv/devices/inputfile.hpp
index e08832f6..165010f7 100644
--- a/pv/devices/inputfile.hpp
+++ b/pv/devices/inputfile.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
-#define PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
+#ifndef PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
+#define PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
 
 #include <atomic>
 
@@ -81,5 +81,5 @@ private:
 } // namespace devices
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SESSIONS_INPUTFILE_HPP
+#endif // PULSEVIEW_PV_DEVICES_INPUTFILE_HPP
 
diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index f34268dd..fe158740 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_CONNECT_HPP
-#define PULSEVIEW_PV_CONNECT_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_CONNECT_HPP
+#define PULSEVIEW_PV_DIALOGS_CONNECT_HPP
 
 #include <memory>
 
@@ -106,4 +106,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_HPP
+#endif // PULSEVIEW_PV_DIALOGS_CONNECT_HPP
diff --git a/pv/dialogs/inputoutputoptions.hpp b/pv/dialogs/inputoutputoptions.hpp
index be6d3308..11c905a4 100644
--- a/pv/dialogs/inputoutputoptions.hpp
+++ b/pv/dialogs/inputoutputoptions.hpp
@@ -70,4 +70,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_INPUTOUTPUTOPTIONS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_INPUTOUTPUTOPTIONS_HPP
diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 50f3be65..157fa6ba 100644
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SETTINGS_HPP
-#define PULSEVIEW_PV_SETTINGS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
+#define PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
 
 #include <QCheckBox>
 #include <QColor>
@@ -102,4 +102,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SETTINGS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index c4256628..fd355899 100644
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
-#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
+#define PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
 
 #include <memory>
 #include <set>
@@ -68,4 +68,4 @@ private:
 }  // namespace dialogs
 }  // namespace pv
 
-#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
diff --git a/pv/globalsettings.hpp b/pv/globalsettings.hpp
index cf1921e8..e41c2ea9 100644
--- a/pv/globalsettings.hpp
+++ b/pv/globalsettings.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
-#define PULSEVIEW_GLOBALSETTINGS_HPP
+#ifndef PULSEVIEW_PV_GLOBALSETTINGS_HPP
+#define PULSEVIEW_PV_GLOBALSETTINGS_HPP
 
 #include <map>
 
@@ -146,4 +146,4 @@ private:
 
 } // namespace pv
 
-#endif // PULSEVIEW_GLOBALSETTINGS_HPP
+#endif // PULSEVIEW_PV_GLOBALSETTINGS_HPP
diff --git a/pv/subwindows/subwindowbase.hpp b/pv/subwindows/subwindowbase.hpp
index ab3a08b4..2688c2b3 100644
--- a/pv/subwindows/subwindowbase.hpp
+++ b/pv/subwindows/subwindowbase.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SUBWINDOWBASE_HPP
-#define PULSEVIEW_PV_SUBWINDOWBASE_HPP
+#ifndef PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP
+#define PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP
 
 #include <cstdint>
 #include <memory>
@@ -90,4 +90,4 @@ protected:
 } // namespace subwindows
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SUBWINDOWBASE_HPP
+#endif // PULSEVIEW_PV_SUBWINDOWS_SUBWINDOWBASE_HPP
diff --git a/pv/util.hpp b/pv/util.hpp
index e1640c4a..354013fe 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_UTIL_HPP
-#define PULSEVIEW_UTIL_HPP
+#ifndef PULSEVIEW_PV_UTIL_HPP
+#define PULSEVIEW_PV_UTIL_HPP
 
 #include <cmath>
 #include <string>
@@ -143,4 +143,4 @@ vector<string> split_string(string text, string separator);
 
 Q_DECLARE_METATYPE(pv::util::Timestamp)
 
-#endif // PULSEVIEW_UTIL_HPP
+#endif // PULSEVIEW_PV_UTIL_HPP
diff --git a/pv/views/decoder_binary/QHexView.hpp b/pv/views/decoder_binary/QHexView.hpp
index 12729f80..5f46ba1c 100644
--- a/pv/views/decoder_binary/QHexView.hpp
+++ b/pv/views/decoder_binary/QHexView.hpp
@@ -27,8 +27,8 @@
  * SOFTWARE.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H
-#define PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H
+#ifndef PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP
+#define PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP
 
 #include <QAbstractScrollArea>
 
@@ -99,4 +99,4 @@ private:
 	vector<QColor> chunk_colors_;
 };
 
-#endif /* PULSEVIEW_PV_VIEWS_DECODERBINARY_QHEXVIEW_H */
+#endif // PULSEVIEW_PV_VIEWS_DECODER_BINARY_QHEXVIEW_HPP
diff --git a/pv/views/decoder_binary/view.hpp b/pv/views/decoder_binary/view.hpp
index c1d70b1b..eea66661 100644
--- a/pv/views/decoder_binary/view.hpp
+++ b/pv/views/decoder_binary/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP
 
 #include <QAction>
 #include <QComboBox>
@@ -112,4 +112,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_DECODERBINARY_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_DECODER_BINARY_VIEW_HPP
diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index 534e3d9d..73fb30c4 100644
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
 
 #include <QAction>
 #include <QCheckBox>
@@ -208,4 +208,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index c588eb88..b15c4434 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
 
 #include <memory>
 
@@ -213,4 +213,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
diff --git a/pv/views/trace/cursor.hpp b/pv/views/trace/cursor.hpp
index 0da72e9f..73e84ee8 100644
--- a/pv/views/trace/cursor.hpp
+++ b/pv/views/trace/cursor.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP
 
 #include "timemarker.hpp"
 
@@ -77,4 +77,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_CURSOR_HPP
diff --git a/pv/views/trace/cursorpair.hpp b/pv/views/trace/cursorpair.hpp
index d59d9414..ba6b2a70 100644
--- a/pv/views/trace/cursorpair.hpp
+++ b/pv/views/trace/cursorpair.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 #include "pv/globalsettings.hpp"
@@ -135,4 +135,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 4a65d5ba..1b79161d 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
 
 #include <config.h>
 #include "trace.hpp"
@@ -335,4 +335,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
diff --git a/pv/views/trace/flag.hpp b/pv/views/trace/flag.hpp
index e58771b8..4c4c977f 100644
--- a/pv/views/trace/flag.hpp
+++ b/pv/views/trace/flag.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP
 
 #include <memory>
 
@@ -93,4 +93,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_FLAG_HPP
diff --git a/pv/views/trace/header.hpp b/pv/views/trace/header.hpp
index 5d2ba4b7..32b7e612 100644
--- a/pv/views/trace/header.hpp
+++ b/pv/views/trace/header.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP
 
 #include <list>
 #include <memory>
@@ -94,4 +94,4 @@ private Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_HEADER_HPP
diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index b769ec55..96e98b4b 100644
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
 
 #include <QCache>
 #include <QColor>
@@ -167,4 +167,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
diff --git a/pv/views/trace/marginwidget.hpp b/pv/views/trace/marginwidget.hpp
index ef5e6350..bedf8a92 100644
--- a/pv/views/trace/marginwidget.hpp
+++ b/pv/views/trace/marginwidget.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
-#define PULSEVIEW_PV_MARGINWIDGET_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP
 
 #include <memory>
 
@@ -73,4 +73,4 @@ protected Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_MARGINWIDGET_HPP
diff --git a/pv/views/trace/ruler.hpp b/pv/views/trace/ruler.hpp
index 9d708ce0..55c156f5 100644
--- a/pv/views/trace/ruler.hpp
+++ b/pv/views/trace/ruler.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
 
 #include <functional>
 #include <memory>
@@ -203,4 +203,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index c9f38dd9..0674209e 100644
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
 
 #include <memory>
 
@@ -119,4 +119,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
diff --git a/pv/views/trace/timeitem.hpp b/pv/views/trace/timeitem.hpp
index 06d85050..acac3273 100644
--- a/pv/views/trace/timeitem.hpp
+++ b/pv/views/trace/timeitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP
 
 #include "viewitem.hpp"
 
@@ -77,4 +77,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TIMEITEM_HPP
diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index cd7c84d2..040a29ea 100644
--- a/pv/views/trace/timemarker.hpp
+++ b/pv/views/trace/timemarker.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -139,4 +139,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 2b98811b..3ea01d46 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -217,4 +217,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
diff --git a/pv/views/trace/tracegroup.hpp b/pv/views/trace/tracegroup.hpp
index 4a793665..b41db6bc 100644
--- a/pv/views/trace/tracegroup.hpp
+++ b/pv/views/trace/tracegroup.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP
 
 #include "tracetreeitem.hpp"
 #include "tracetreeitemowner.hpp"
@@ -131,4 +131,4 @@ private Q_SLOTS:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACEGROUP_HPP
diff --git a/pv/views/trace/tracepalette.hpp b/pv/views/trace/tracepalette.hpp
index 7819ee6c..6273605d 100644
--- a/pv/views/trace/tracepalette.hpp
+++ b/pv/views/trace/tracepalette.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP
 
 #include <QColor>
 
@@ -38,4 +38,4 @@ public:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEPALETTE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACEPALETTE_HPP
diff --git a/pv/views/trace/tracetreeitem.hpp b/pv/views/trace/tracetreeitem.hpp
index 51e2ba42..e5ebbdd7 100644
--- a/pv/views/trace/tracetreeitem.hpp
+++ b/pv/views/trace/tracetreeitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
 
 #include <memory>
 
@@ -133,4 +133,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
diff --git a/pv/views/trace/tracetreeitemowner.hpp b/pv/views/trace/tracetreeitemowner.hpp
index 57109007..b7e95843 100644
--- a/pv/views/trace/tracetreeitemowner.hpp
+++ b/pv/views/trace/tracetreeitemowner.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP
 
 #include "viewitemowner.hpp"
 #include "tracetreeitem.hpp"
@@ -110,4 +110,4 @@ public:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEMOWNER_HPP
diff --git a/pv/views/trace/triggermarker.hpp b/pv/views/trace/triggermarker.hpp
index 222d3fb9..40c096c0 100644
--- a/pv/views/trace/triggermarker.hpp
+++ b/pv/views/trace/triggermarker.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
 
 #include "timeitem.hpp"
 
@@ -92,4 +92,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRIGGER_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRIGGERMARKER_HPP
diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 1d630158..63bafbfe 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
 
 #include <cstdint>
 #include <list>
@@ -587,4 +587,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
diff --git a/pv/views/trace/viewitem.hpp b/pv/views/trace/viewitem.hpp
index 423e75d2..77c8665e 100644
--- a/pv/views/trace/viewitem.hpp
+++ b/pv/views/trace/viewitem.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWITEM_HPP
-#define PULSEVIEW_PV_VIEWITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP
 
 #include <list>
 
@@ -191,4 +191,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEM_HPP
diff --git a/pv/views/trace/viewitemiterator.hpp b/pv/views/trace/viewitemiterator.hpp
index 88600d08..f94efa90 100644
--- a/pv/views/trace/viewitemiterator.hpp
+++ b/pv/views/trace/viewitemiterator.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -129,4 +129,4 @@ void swap(ViewItemIterator<Owner, Item>& a, ViewItemIterator<Owner, Item>& b)
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMITERATOR_HPP
diff --git a/pv/views/trace/viewitemowner.hpp b/pv/views/trace/viewitemowner.hpp
index 29f74b5a..9f4143cb 100644
--- a/pv/views/trace/viewitemowner.hpp
+++ b/pv/views/trace/viewitemowner.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP
 
 #include <memory>
 #include <vector>
@@ -98,4 +98,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMOWNER_HPP
diff --git a/pv/views/trace/viewitempaintparams.hpp b/pv/views/trace/viewitempaintparams.hpp
index 725a4336..e52b92f1 100644
--- a/pv/views/trace/viewitempaintparams.hpp
+++ b/pv/views/trace/viewitempaintparams.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
 
 #include "pv/util.hpp"
 
@@ -97,4 +97,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
diff --git a/pv/views/trace/viewport.hpp b/pv/views/trace/viewport.hpp
index 1b77a0d0..48f2d09c 100644
--- a/pv/views/trace/viewport.hpp
+++ b/pv/views/trace/viewport.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP
 
 #include <boost/optional.hpp>
 
@@ -111,4 +111,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWPORT_HPP
diff --git a/pv/views/trace/viewwidget.hpp b/pv/views/trace/viewwidget.hpp
index 427a8994..ef3cfa2f 100644
--- a/pv/views/trace/viewwidget.hpp
+++ b/pv/views/trace/viewwidget.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
-#define PULSEVIEW_PV_VIEWWIDGET_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP
 
 #include <memory>
 
@@ -161,4 +161,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWWIDGET_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWWIDGET_HPP
diff --git a/pv/widgets/flowlayout.hpp b/pv/widgets/flowlayout.hpp
index 81407d1b..c8ee0941 100644
--- a/pv/widgets/flowlayout.hpp
+++ b/pv/widgets/flowlayout.hpp
@@ -38,8 +38,8 @@
  **
  ****************************************************************************/
 
-#ifndef FLOWLAYOUT_H
-#define FLOWLAYOUT_H
+#ifndef PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP
+#define PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP
 
 #include <QLayout>
 #include <QRect>
@@ -75,4 +75,4 @@ private:
 	int m_hSpace, m_vSpace;
 };
 
-#endif
+#endif // PULSEVIEW_PV_WIDGETS_FLOWLAYOUT_HPP
diff --git a/pv/widgets/timestampspinbox.hpp b/pv/widgets/timestampspinbox.hpp
index 123ef876..25e30ac5 100644
--- a/pv/widgets/timestampspinbox.hpp
+++ b/pv/widgets/timestampspinbox.hpp
@@ -89,4 +89,4 @@ private:
 }  // namespace widgets
 }  // namespace pv
 
-#endif
+#endif // PULSEVIEW_PV_WIDGETS_TIMESTAMPSPINBOX_HPP
diff --git a/signalhandler.hpp b/signalhandler.hpp
index a17b04b9..fad3ac39 100644
--- a/signalhandler.hpp
+++ b/signalhandler.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SIGNALHANDLER_HPP
-#define PULSEVIEW_PV_SIGNALHANDLER_HPP
+#ifndef PULSEVIEW_SIGNALHANDLER_HPP
+#define PULSEVIEW_SIGNALHANDLER_HPP
 
 #include <QObject>
 
@@ -51,4 +51,4 @@ private:
 	static int sockets_[2];
 };
 
-#endif // PULSEVIEW_PV_SIGNALHANDLER_HPP
+#endif // PULSEVIEW_SIGNALHANDLER_HPP
diff --git a/test/test.hpp b/test/test.hpp
index 62e6cf0d..41e96acc 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -26,4 +26,4 @@ using std::ostream;
 
 ostream& operator<<(ostream& stream, const QString& str);
 
-#endif
+#endif // PULSEVIEW_TEST_TEST_HPP