From: Joel Holdsworth <redacted>
Date: Sat, 17 Jan 2015 22:00:52 +0000 (+0000)
Subject: Modified header guards to match file names
X-Git-Tag: pulseview-0.3.0~244
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git

Modified header guards to match file names
---

diff --git a/android/loghandler.hpp b/android/loghandler.hpp
index e49158ad..b12a36e1 100644
--- a/android/loghandler.hpp
+++ b/android/loghandler.hpp
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_ANDROID_LOGHANDLER_H
-#define PULSEVIEW_ANDROID_LOGHANDLER_H
+#ifndef PULSEVIEW_ANDROID_LOGHANDLER_HPP
+#define PULSEVIEW_ANDROID_LOGHANDLER_HPP
 
 #include <stdarg.h>
 
@@ -36,4 +36,4 @@ public:
 
 } // namespace pv
 
-#endif // PULSEVIEW_ANDROID_LOGHANDLER_H
+#endif // PULSEVIEW_ANDROID_LOGHANDLER_HPP
diff --git a/pv/application.hpp b/pv/application.hpp
index 5a80ec86..8d0ebd4d 100644
--- a/pv/application.hpp
+++ b/pv/application.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_APPLICATION_H
-#define PULSEVIEW_PV_APPLICATION_H
+#ifndef PULSEVIEW_PV_APPLICATION_HPP
+#define PULSEVIEW_PV_APPLICATION_HPP
 
 #include <QApplication>
 
@@ -31,4 +31,4 @@ private:
 	bool notify(QObject *receiver, QEvent *event);
 };
 
-#endif // PULSEVIEW_PV_APPLICATION_H
+#endif // PULSEVIEW_PV_APPLICATION_HPP
diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index ae0afb7d..bd858bbf 100644
--- a/pv/binding/binding.hpp
+++ b/pv/binding/binding.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_BINDING_BINDING_H
-#define PULSEVIEW_PV_BINDING_BINDING_H
+#ifndef PULSEVIEW_PV_BINDING_BINDING_HPP
+#define PULSEVIEW_PV_BINDING_BINDING_HPP
 
 #include <glibmm.h>
 
@@ -61,4 +61,4 @@ protected:
 } // binding
 } // pv
 
-#endif // PULSEVIEW_PV_BINDING_BINDING_H
+#endif // PULSEVIEW_PV_BINDING_BINDING_HPP
diff --git a/pv/binding/decoder.hpp b/pv/binding/decoder.hpp
index 48e5945b..107ac15d 100644
--- a/pv/binding/decoder.hpp
+++ b/pv/binding/decoder.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_BINDING_DECODER_H
-#define PULSEVIEW_PV_BINDING_DECODER_H
+#ifndef PULSEVIEW_PV_BINDING_DECODER_HPP
+#define PULSEVIEW_PV_BINDING_DECODER_HPP
 
 #include "binding.hpp"
 
@@ -61,4 +61,4 @@ private:
 } // binding
 } // pv
 
-#endif // PULSEVIEW_PV_BINDING_DECODER_H
+#endif // PULSEVIEW_PV_BINDING_DECODER_HPP
diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 2a4c5163..a8acd166 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_BINDING_DEVICE_H
-#define PULSEVIEW_PV_BINDING_DEVICE_H
+#ifndef PULSEVIEW_PV_BINDING_DEVICE_HPP
+#define PULSEVIEW_PV_BINDING_DEVICE_HPP
 
 #include <boost/optional.hpp>
 
@@ -69,4 +69,4 @@ protected:
 } // binding
 } // pv
 
-#endif // PULSEVIEW_PV_BINDING_DEVICE_H
+#endif // PULSEVIEW_PV_BINDING_DEVICE_HPP
diff --git a/pv/data/analog.hpp b/pv/data/analog.hpp
index 2fe588e4..777deb6d 100644
--- a/pv/data/analog.hpp
+++ b/pv/data/analog.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_ANALOG_H
-#define PULSEVIEW_PV_DATA_ANALOG_H
+#ifndef PULSEVIEW_PV_DATA_ANALOG_HPP
+#define PULSEVIEW_PV_DATA_ANALOG_HPP
 
 #include "signaldata.hpp"
 
@@ -55,4 +55,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_ANALOG_H
+#endif // PULSEVIEW_PV_DATA_ANALOG_HPP
diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 38922f59..6ab7a50b 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_H
-#define PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
+#define PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
 
 #include "segment.hpp"
 
@@ -93,4 +93,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp
index f1e2ef35..071f292a 100644
--- a/pv/data/decode/annotation.hpp
+++ b/pv/data/decode/annotation.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
-#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
+#ifndef PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
+#define PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
 
 #include <stdint.h>
 
@@ -52,4 +52,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_H
+#endif // PULSEVIEW_PV_VIEW_DECODE_ANNOTATION_HPP
diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index aa79e01c..3f0f462b 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_H
-#define PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
+#define PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
 
 #include <map>
 #include <memory>
@@ -86,4 +86,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
diff --git a/pv/data/decode/row.hpp b/pv/data/decode/row.hpp
index 3a163fb3..6413e788 100644
--- a/pv/data/decode/row.hpp
+++ b/pv/data/decode/row.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODE_ROW_H
-#define PULSEVIEW_PV_DATA_DECODE_ROW_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_ROW_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ROW_HPP
 
 #include <vector>
 
@@ -56,4 +56,4 @@ private:
 } // data
 } // pv
 
-#endif // PULSEVIEW_PV_DATA_DECODE_ROW_H
+#endif // PULSEVIEW_PV_DATA_DECODE_ROW_HPP
diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 568b1bb0..820959d4 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
-#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
+#define PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
 
 #include <vector>
 
@@ -54,4 +54,4 @@ private:
 } // data
 } // pv
 
-#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_H
+#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 38310990..cd380dfb 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H
-#define PULSEVIEW_PV_DATA_DECODERSTACK_H
+#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
+#define PULSEVIEW_PV_DATA_DECODERSTACK_HPP
 
 #include "signaldata.hpp"
 
@@ -173,4 +173,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP
diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp
index 9adc9750..baad18f7 100644
--- a/pv/data/logic.hpp
+++ b/pv/data/logic.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGIC_H
-#define PULSEVIEW_PV_DATA_LOGIC_H
+#ifndef PULSEVIEW_PV_DATA_LOGIC_HPP
+#define PULSEVIEW_PV_DATA_LOGIC_HPP
 
 #include "signaldata.hpp"
 
@@ -57,4 +57,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGIC_H
+#endif // PULSEVIEW_PV_DATA_LOGIC_HPP
diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 3e092c53..9d07d203 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
-#define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
+#define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
 
 #include "segment.hpp"
 
@@ -116,4 +116,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index a754eab2..bfb10292 100644
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_SNAPSHOT_H
-#define PULSEVIEW_PV_DATA_SNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_SNAPSHOT_HPP
+#define PULSEVIEW_PV_DATA_SNAPSHOT_HPP
 
 #include <thread>
 #include <mutex>
@@ -87,4 +87,4 @@ protected:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_SNAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_SNAPSHOT_HPP
diff --git a/pv/data/signaldata.hpp b/pv/data/signaldata.hpp
index c49cb5c0..11768f69 100644
--- a/pv/data/signaldata.hpp
+++ b/pv/data/signaldata.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_SIGNALDATA_H
-#define PULSEVIEW_PV_DATA_SIGNALDATA_H
+#ifndef PULSEVIEW_PV_DATA_SIGNALDATA_HPP
+#define PULSEVIEW_PV_DATA_SIGNALDATA_HPP
 
 #include <cstdint>
 #include <memory>
@@ -47,4 +47,4 @@ public:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_SIGNALDATA_H
+#endif // PULSEVIEW_PV_DATA_SIGNALDATA_HPP
diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 2ecf54af..5aed7758 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DEVICEMANAGER_H
-#define PULSEVIEW_PV_DEVICEMANAGER_H
+#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
+#define PULSEVIEW_PV_DEVICEMANAGER_HPP
 
 #include <list>
 #include <map>
@@ -86,4 +86,4 @@ protected:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DEVICEMANAGER_H
+#endif // PULSEVIEW_PV_DEVICEMANAGER_HPP
diff --git a/pv/dialogs/about.hpp b/pv/dialogs/about.hpp
index 6656f9c0..6b6b67b4 100644
--- a/pv/dialogs/about.hpp
+++ b/pv/dialogs/about.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_ABOUT_H
-#define PULSEVIEW_PV_ABOUT_H
+#ifndef PULSEVIEW_PV_ABOUT_HPP
+#define PULSEVIEW_PV_ABOUT_HPP
 
 #include <QDialog>
 
@@ -54,4 +54,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ABOUT_H
+#endif // PULSEVIEW_PV_ABOUT_HPP
diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index ba8339c7..a0bac740 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_CONNECT_H
-#define PULSEVIEW_PV_CONNECT_H
+#ifndef PULSEVIEW_PV_CONNECT_HPP
+#define PULSEVIEW_PV_CONNECT_HPP
 
 #include <memory>
 
@@ -90,4 +90,4 @@ private:
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_CONNECT_H
+#endif // PULSEVIEW_PV_CONNECT_HPP
diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index 6bb2292e..389aad81 100644
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_H
-#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_H
+#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
 
 #include <memory>
 #include <set>
@@ -62,4 +62,4 @@ private:
 } // dialogs
 } // pv
 
-#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_H
+#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index c0717e4f..2548e0ef 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
 #include <memory>
@@ -168,4 +168,4 @@ private:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index a0b0693f..6ba86469 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_H
-#define PULSEVIEW_PV_POPUPS_CHANNELS_H
+#ifndef PULSEVIEW_PV_POPUPS_CHANNELS_HPP
+#define PULSEVIEW_PV_POPUPS_CHANNELS_HPP
 
 #include <map>
 #include <memory>
@@ -100,4 +100,4 @@ private:
 } // popups
 } // pv
 
-#endif // PULSEVIEW_PV_POPUPS_CHANNELS_H
+#endif // PULSEVIEW_PV_POPUPS_CHANNELS_HPP
diff --git a/pv/popups/deviceoptions.hpp b/pv/popups/deviceoptions.hpp
index f840e83f..e358932a 100644
--- a/pv/popups/deviceoptions.hpp
+++ b/pv/popups/deviceoptions.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
-#define PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#ifndef PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
+#define PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
 
 #include <QGroupBox>
 #include <QVBoxLayout>
@@ -55,4 +55,4 @@ private:
 } // namespace popups
 } // namespace pv
 
-#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
diff --git a/pv/prop/bool.hpp b/pv/prop/bool.hpp
index 965efc19..6d32da7e 100644
--- a/pv/prop/bool.hpp
+++ b/pv/prop/bool.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_BOOL_H
-#define PULSEVIEW_PV_PROP_BOOL_H
+#ifndef PULSEVIEW_PV_PROP_BOOL_HPP
+#define PULSEVIEW_PV_PROP_BOOL_HPP
 
 #include "property.hpp"
 
@@ -52,4 +52,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_BOOL_H
+#endif // PULSEVIEW_PV_PROP_BOOL_HPP
diff --git a/pv/prop/double.hpp b/pv/prop/double.hpp
index 89b74cca..b62d1fa6 100644
--- a/pv/prop/double.hpp
+++ b/pv/prop/double.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_DOUBLE_H
-#define PULSEVIEW_PV_PROP_DOUBLE_H
+#ifndef PULSEVIEW_PV_PROP_DOUBLE_HPP
+#define PULSEVIEW_PV_PROP_DOUBLE_HPP
 
 #include <utility>
 
@@ -64,4 +64,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_DOUBLE_H
+#endif // PULSEVIEW_PV_PROP_DOUBLE_HPP
diff --git a/pv/prop/enum.hpp b/pv/prop/enum.hpp
index 7b7fcc5d..63f78af0 100644
--- a/pv/prop/enum.hpp
+++ b/pv/prop/enum.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_ENUM_H
-#define PULSEVIEW_PV_PROP_ENUM_H
+#ifndef PULSEVIEW_PV_PROP_ENUM_HPP
+#define PULSEVIEW_PV_PROP_ENUM_HPP
 
 #include <utility>
 #include <vector>
@@ -61,4 +61,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_ENUM_H
+#endif // PULSEVIEW_PV_PROP_ENUM_HPP
diff --git a/pv/prop/int.hpp b/pv/prop/int.hpp
index a1c529fd..60c9d513 100644
--- a/pv/prop/int.hpp
+++ b/pv/prop/int.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_INT_H
-#define PULSEVIEW_PV_PROP_INT_H
+#ifndef PULSEVIEW_PV_PROP_INT_HPP
+#define PULSEVIEW_PV_PROP_INT_HPP
 
 #include <utility>
 
@@ -61,4 +61,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_INT_H
+#endif // PULSEVIEW_PV_PROP_INT_HPP
diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index 26208258..123783ae 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_PROPERTY_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
+#define PULSEVIEW_PV_PROP_PROPERTY_HPP
 
 #include <glibmm.h>
 
@@ -63,4 +63,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_HPP
diff --git a/pv/prop/string.hpp b/pv/prop/string.hpp
index db57f7cd..9cd92786 100644
--- a/pv/prop/string.hpp
+++ b/pv/prop/string.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_PROP_STRING_H
-#define PULSEVIEW_PV_PROP_STRING_H
+#ifndef PULSEVIEW_PV_PROP_STRING_HPP
+#define PULSEVIEW_PV_PROP_STRING_HPP
 
 #include "property.hpp"
 
@@ -49,4 +49,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_STRING_H
+#endif // PULSEVIEW_PV_PROP_STRING_HPP
diff --git a/pv/session.hpp b/pv/session.hpp
index 8f1860dc..0f904d0d 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGSESSION_H
-#define PULSEVIEW_PV_SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_HPP
+#define PULSEVIEW_PV_SIGSESSION_HPP
 
 #include <map>
 #include <memory>
@@ -192,4 +192,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_HPP
diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index e6778b5e..946fac41 100644
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_STORESESSION_H
-#define PULSEVIEW_PV_STORESESSION_H
+#ifndef PULSEVIEW_PV_STORESESSION_HPP
+#define PULSEVIEW_PV_STORESESSION_HPP
 
 #include <stdint.h>
 
@@ -95,4 +95,4 @@ private:
 
 } // pv
 
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_HPP
diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index 10475e27..64c8a6c7 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H
-#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
+#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 
 #include <stdint.h>
 
@@ -116,4 +116,4 @@ private:
 } // namespace toolbars
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
diff --git a/pv/util.hpp b/pv/util.hpp
index 5466322b..f75c9572 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_UTIL_H
-#define PULSEVIEW_UTIL_H
+#ifndef PULSEVIEW_UTIL_HPP
+#define PULSEVIEW_UTIL_HPP
 
 #include <cmath>
 
@@ -71,4 +71,4 @@ QString format_second(double second);
 } // namespace util
 } // namespace pv
 
-#endif // PULSEVIEW_UTIL_H
+#endif // PULSEVIEW_UTIL_HPP
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 10cbab53..4f737aaa 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
@@ -94,4 +94,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
diff --git a/pv/view/cursor.hpp b/pv/view/cursor.hpp
index 03b97a17..e64beaa9 100644
--- a/pv/view/cursor.hpp
+++ b/pv/view/cursor.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_CURSOR_H
-#define PULSEVIEW_PV_VIEW_CURSOR_H
+#ifndef PULSEVIEW_PV_VIEW_CURSOR_HPP
+#define PULSEVIEW_PV_VIEW_CURSOR_HPP
 
 #include "timemarker.hpp"
 
@@ -72,4 +72,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSOR_H
+#endif // PULSEVIEW_PV_VIEW_CURSOR_HPP
diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index aacc7d8c..af7e67dc 100644
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_H
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -108,4 +108,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index ada01db7..49168522 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
 
 #include "trace.hpp"
 
@@ -206,4 +206,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP
diff --git a/pv/view/flag.hpp b/pv/view/flag.hpp
index c4e4cbb2..26562102 100644
--- a/pv/view/flag.hpp
+++ b/pv/view/flag.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_FLAG_H
-#define PULSEVIEW_PV_VIEW_FLAG_H
+#ifndef PULSEVIEW_PV_VIEW_FLAG_HPP
+#define PULSEVIEW_PV_VIEW_FLAG_HPP
 
 #include <memory>
 
@@ -80,4 +80,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_FLAG_H
+#endif // PULSEVIEW_PV_VIEW_FLAG_HPP
diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index ac8f792f..91612b95 100644
--- a/pv/view/header.hpp
+++ b/pv/view/header.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_HEADER_H
-#define PULSEVIEW_PV_VIEW_HEADER_H
+#ifndef PULSEVIEW_PV_VIEW_HEADER_HPP
+#define PULSEVIEW_PV_VIEW_HEADER_HPP
 
 #include <list>
 #include <memory>
@@ -91,4 +91,4 @@ private Q_SLOTS:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_HEADER_H
+#endif // PULSEVIEW_PV_VIEW_HEADER_HPP
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 769b2fb6..2542e241 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -144,4 +144,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index 0a24ad2e..963d7171 100644
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_MARGINWIDGET_HPP
 
 #include <memory>
 
@@ -69,4 +69,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_HPP
diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index 023e2c38..331acdde 100644
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_HEADERITEM_H
-#define PULSEVIEW_PV_VIEW_HEADERITEM_H
+#ifndef PULSEVIEW_PV_VIEW_HEADERITEM_HPP
+#define PULSEVIEW_PV_VIEW_HEADERITEM_HPP
 
 #include <memory>
 
@@ -127,4 +127,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_HEADERITEM_H
+#endif // PULSEVIEW_PV_VIEW_HEADERITEM_HPP
diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp
index 577b4713..c45507bb 100644
--- a/pv/view/rowitemiterator.hpp
+++ b/pv/view/rowitemiterator.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
-#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -140,4 +140,4 @@ void swap(RowItemIterator<Owner, Item>& a, RowItemIterator<Owner, Item>& b)
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
diff --git a/pv/view/rowitemowner.hpp b/pv/view/rowitemowner.hpp
index 42335195..f5c2abd7 100644
--- a/pv/view/rowitemowner.hpp
+++ b/pv/view/rowitemowner.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMOWNER_H
-#define PULSEVIEW_PV_VIEW_ROWITEMOWNER_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEW_ROWITEMOWNER_HPP
 
 #include <memory>
 #include <vector>
@@ -138,4 +138,4 @@ private:
 } // view
 } // pv
 
-#endif // PULSEVIEW_PV_VIEW_ROWITEMOWNER_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMOWNER_HPP
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index a2b80ab9..50bbf2cd 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_RULER_H
-#define PULSEVIEW_PV_VIEW_RULER_H
+#ifndef PULSEVIEW_PV_VIEW_RULER_HPP
+#define PULSEVIEW_PV_VIEW_RULER_HPP
 
 #include <memory>
 
@@ -95,4 +95,4 @@ private Q_SLOTS:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_RULER_H
+#endif // PULSEVIEW_PV_VIEW_RULER_HPP
diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 910b2e69..8208a762 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
-#define PULSEVIEW_PV_VIEW_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_SIGNAL_HPP
 
 #include <memory>
 
@@ -89,4 +89,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP
diff --git a/pv/view/timeitem.hpp b/pv/view/timeitem.hpp
index ba4ce8b6..4cb650d9 100644
--- a/pv/view/timeitem.hpp
+++ b/pv/view/timeitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TIMEITEM_H
-#define PULSEVIEW_PV_VIEW_TIMEITEM_H
+#ifndef PULSEVIEW_PV_VIEW_TIMEITEM_HPP
+#define PULSEVIEW_PV_VIEW_TIMEITEM_HPP
 
 #include "viewitem.hpp"
 
@@ -61,4 +61,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TIMEITEM_H
+#endif // PULSEVIEW_PV_VIEW_TIMEITEM_HPP
diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 113a6a10..c72dedf5 100644
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_MARKER_H
-#define PULSEVIEW_PV_VIEW_MARKER_H
+#ifndef PULSEVIEW_PV_VIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEW_MARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -126,4 +126,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEW_MARKER_HPP
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index e6e053da..7d0b8a09 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_H
-#define PULSEVIEW_PV_VIEW_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -133,4 +133,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
diff --git a/pv/view/tracegroup.hpp b/pv/view/tracegroup.hpp
index 2a78f22c..5310313a 100644
--- a/pv/view/tracegroup.hpp
+++ b/pv/view/tracegroup.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_H
-#define PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
 
 #include "rowitem.hpp"
 #include "rowitemowner.hpp"
@@ -130,4 +130,4 @@ private Q_SLOTS:
 } // view
 } // pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
diff --git a/pv/view/tracepalette.hpp b/pv/view/tracepalette.hpp
index ae3c69ad..e878a225 100644
--- a/pv/view/tracepalette.hpp
+++ b/pv/view/tracepalette.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TRACEPALETTE_H
-#define PULSEVIEW_PV_TRACEPALETTE_H
+#ifndef PULSEVIEW_PV_TRACEPALETTE_HPP
+#define PULSEVIEW_PV_TRACEPALETTE_HPP
 
 #include <QColor>
 
@@ -38,4 +38,4 @@ public:
 } // view
 } // pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACEPALETTE_H
+#endif // PULSEVIEW_PV_VIEW_TRACEPALETTE_HPP
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 74a5c375..e4d0ebad 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEW_H
-#define PULSEVIEW_PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEW_VIEW_HPP
 
 #include <stdint.h>
 
@@ -300,4 +300,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_HPP
diff --git a/pv/view/viewitem.hpp b/pv/view/viewitem.hpp
index 7579b555..ee77c4ae 100644
--- a/pv/view/viewitem.hpp
+++ b/pv/view/viewitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEWITEM_H
-#define PULSEVIEW_PV_VIEWITEM_H
+#ifndef PULSEVIEW_PV_VIEWITEM_HPP
+#define PULSEVIEW_PV_VIEWITEM_HPP
 
 #include <list>
 
@@ -167,4 +167,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWITEM_H
+#endif // PULSEVIEW_PV_VIEWITEM_HPP
diff --git a/pv/view/viewitempaintparams.hpp b/pv/view/viewitempaintparams.hpp
index 73551e6d..86742ba7 100644
--- a/pv/view/viewitempaintparams.hpp
+++ b/pv/view/viewitempaintparams.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
-#define PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
 
 #include <QFont>
 
@@ -85,4 +85,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index 78dfbb24..2c8211b8 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
-#define PULSEVIEW_PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEW_VIEWPORT_HPP
 
 #include <QTimer>
 #include <QTouchEvent>
@@ -103,4 +103,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEW_VIEWPORT_HPP
diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index 003c0eed..e2c04f29 100644
--- a/pv/view/viewwidget.hpp
+++ b/pv/view/viewwidget.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEWWIDGET_H
-#define PULSEVIEW_PV_VIEWWIDGET_H
+#ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
+#define PULSEVIEW_PV_VIEWWIDGET_HPP
 
 #include <memory>
 
@@ -149,4 +149,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWWIDGET_H
+#endif // PULSEVIEW_PV_VIEWWIDGET_HPP
diff --git a/pv/widgets/colourbutton.hpp b/pv/widgets/colourbutton.hpp
index d7f019a6..86e8e98f 100644
--- a/pv/widgets/colourbutton.hpp
+++ b/pv/widgets/colourbutton.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
-#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
+#ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_HPP
+#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_HPP
 
 #include <QPushButton>
 
@@ -65,4 +65,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURBUTTON_HPP
diff --git a/pv/widgets/colourpopup.hpp b/pv/widgets/colourpopup.hpp
index 9273b5da..2abf1b78 100644
--- a/pv/widgets/colourpopup.hpp
+++ b/pv/widgets/colourpopup.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
-#define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#ifndef PULSEVIEW_PV_WIDGETS_COLOURPOPUP_HPP
+#define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_HPP
 
 #include "popup.hpp"
 #include "wellarray.hpp"
@@ -52,4 +52,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_HPP
diff --git a/pv/widgets/decodergroupbox.hpp b/pv/widgets/decodergroupbox.hpp
index 2c820762..09c83f27 100644
--- a/pv/widgets/decodergroupbox.hpp
+++ b/pv/widgets/decodergroupbox.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_H
-#define PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_H
+#ifndef PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_HPP
+#define PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_HPP
 
 #include <QPushButton>
 
@@ -53,4 +53,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_H
+#endif // PULSEVIEW_PV_WIDGETS_DECODERGROUPBOX_HPP
diff --git a/pv/widgets/decodermenu.hpp b/pv/widgets/decodermenu.hpp
index 92c3a821..e154cd26 100644
--- a/pv/widgets/decodermenu.hpp
+++ b/pv/widgets/decodermenu.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_DECODERMENU_H
-#define PULSEVIEW_PV_WIDGETS_DECODERMENU_H
+#ifndef PULSEVIEW_PV_WIDGETS_DECODERMENU_HPP
+#define PULSEVIEW_PV_WIDGETS_DECODERMENU_HPP
 
 #include <QMenu>
 #include <QSignalMapper>
@@ -53,4 +53,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_DECODERMENU_H
+#endif // PULSEVIEW_PV_WIDGETS_DECODERMENU_HPP
diff --git a/pv/widgets/devicetoolbutton.hpp b/pv/widgets/devicetoolbutton.hpp
index 684d87b0..af9e6e68 100644
--- a/pv/widgets/devicetoolbutton.hpp
+++ b/pv/widgets/devicetoolbutton.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
-#define PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
+#ifndef PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
+#define PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
 
 #include <list>
 #include <memory>
@@ -102,4 +102,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
+#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
diff --git a/pv/widgets/exportmenu.hpp b/pv/widgets/exportmenu.hpp
index 7cd44070..1a29128d 100644
--- a/pv/widgets/exportmenu.hpp
+++ b/pv/widgets/exportmenu.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_EXPORTMENU_H
-#define PULSEVIEW_PV_WIDGETS_EXPORTMENU_H
+#ifndef PULSEVIEW_PV_WIDGETS_EXPORTMENU_HPP
+#define PULSEVIEW_PV_WIDGETS_EXPORTMENU_HPP
 
 #include <memory>
 
@@ -56,4 +56,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_EXPORTMENU_H
+#endif // PULSEVIEW_PV_WIDGETS_EXPORTMENU_HPP
diff --git a/pv/widgets/hidingmenubar.hpp b/pv/widgets/hidingmenubar.hpp
index bd9a1151..4cf5d168 100644
--- a/pv/widgets/hidingmenubar.hpp
+++ b/pv/widgets/hidingmenubar.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_H
-#define PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_H
+#ifndef PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_HPP
+#define PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_HPP
 
 #include <QMenuBar>
 
@@ -63,4 +63,4 @@ private Q_SLOTS:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_H
+#endif // PULSEVIEW_PV_WIDGETS_HIDINGMENUBAR_HPP
diff --git a/pv/widgets/popup.hpp b/pv/widgets/popup.hpp
index 83ad7ee0..c6f931f6 100644
--- a/pv/widgets/popup.hpp
+++ b/pv/widgets/popup.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_POPUP_H
-#define PULSEVIEW_PV_WIDGETS_POPUP_H
+#ifndef PULSEVIEW_PV_WIDGETS_POPUP_HPP
+#define PULSEVIEW_PV_WIDGETS_POPUP_HPP
 
 #include <QWidget>
 
@@ -94,4 +94,4 @@ private:
 } // namespace widgets
 } // namespace pv
 
-#endif // PULSEVIEW_PV_WIDGETS_POPUP_H
+#endif // PULSEVIEW_PV_WIDGETS_POPUP_HPP
diff --git a/pv/widgets/popuptoolbutton.hpp b/pv/widgets/popuptoolbutton.hpp
index 6f6111d5..3586aaf9 100644
--- a/pv/widgets/popuptoolbutton.hpp
+++ b/pv/widgets/popuptoolbutton.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_H
-#define PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_H
+#ifndef PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_HPP
+#define PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_HPP
 
 #include "popup.hpp"
 
@@ -49,4 +49,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_H
+#endif // PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_HPP
diff --git a/pv/widgets/sweeptimingwidget.hpp b/pv/widgets/sweeptimingwidget.hpp
index 5510865e..d760a79d 100644
--- a/pv/widgets/sweeptimingwidget.hpp
+++ b/pv/widgets/sweeptimingwidget.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_H
-#define PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_H
+#ifndef PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_HPP
+#define PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_HPP
 
 #include <libsigrok/libsigrok.h>
 
@@ -72,4 +72,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_H
+#endif // PULSEVIEW_PV_WIDGETS_SWEEPTIMINGWIDGET_HPP
diff --git a/signalhandler.hpp b/signalhandler.hpp
index fe54ff2a..fff9efc7 100644
--- a/signalhandler.hpp
+++ b/signalhandler.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGNALHANDLER_H
-#define SIGNALHANDLER_H
+#ifndef SIGNALHANDLER_HPP
+#define SIGNALHANDLER_HPP
 
 #include <QObject>
 
@@ -52,4 +52,4 @@ private:
 	static int sockets_[2];
 };
 
-#endif // SIGNALHANDLER_H
+#endif // SIGNALHANDLER_HPP