clean up headers

Author: jvde-github

Makefile

@@ -1,5 +1,5 @@
 SRC = Tracking/Ships.cpp Marine/N2K.cpp IO/N2KInterface.cpp Device/N2KsktCAN.cpp IO/N2KStream.cpp Application/Prometheus.cpp Application/Main.cpp Application/WebViewer.cpp Application/MapTiles.cpp IO/HTTPClient.cpp DBMS/PostgreSQL.cpp Tracking/DB.cpp Application/Config.cpp Application/DeviceManager.cpp Application/Receiver.cpp IO/HTTPServer.cpp DSP/DSP.cpp JSON/JSONAIS.cpp JSON/Parser.cpp JSON/StringBuilder.cpp JSON/Keys.cpp Marine/AIS.cpp IO/Network.cpp DSP/Model.cpp Marine/NMEA.cpp DSP/Demod.cpp Marine/Message.cpp Device/UDP.cpp Device/ZMQ.cpp Device/RTLSDR.cpp Device/AIRSPYHF.cpp Device/SoapySDR.cpp Device/AIRSPY.cpp Device/FileRAW.cpp Device/FileWAV.cpp Device/SDRPLAY.cpp Device/RTLTCP.cpp Device/HACKRF.cpp Device/Serial.cpp Library/TCP.cpp Device/SpyServer.cpp JSON/JSON.cpp IO/Protocol.cpp IO/MsgOut.cpp IO/Screen.cpp Library/Logger.cpp Aviation/Basestation.cpp  Application/WebDB.cpp Aviation/Beast.cpp Aviation/ADSB.cpp Utilities/Parse.cpp Utilities/Convert.cpp Utilities/Helper.cpp Utilities/Serialize.cpp Utilities/TemplateString.cpp Utilities/StreamHelpers.cpp
-OBJ = Ships.o Main.o N2KStream.o N2K.o N2KInterface.o N2KsktCAN.o Prometheus.o DeviceManager.o Receiver.o Config.o WebViewer.o MapTiles.o HTTPClient.o PostgreSQL.o DB.o DSP.o AIS.o Model.o Network.o Demod.o Serial.o RTLSDR.o HTTPServer.o AIRSPYHF.o Keys.o AIRSPY.o Parser.o StringBuilder.o FileRAW.o FileWAV.o SDRPLAY.o NMEA.o RTLTCP.o HACKRF.o ZMQ.o UDP.o SoapySDR.o TCP.o Message.o SpyServer.o JSON.o JSONAIS.o Protocol.o MsgOut.o Screen.o Logger.o Basestation.o WebDB.o Beast.o ADSB.o UtilParse.o UtilConvert.o UtilHelper.o UtilSerialize.o UtilTemplateString.o UtilStreamHelpers.o
+OBJ = Ships.o Main.o N2KStream.o N2K.o N2KInterface.o N2KsktCAN.o Prometheus.o DeviceManager.o Receiver.o Config.o WebViewer.o MapTiles.o HTTPClient.o PostgreSQL.o DB.o DSP.o AIS.o Model.o Network.o Demod.o Serial.o RTLSDR.o HTTPServer.o AIRSPYHF.o Keys.o AIRSPY.o Parser.o StringBuilder.o FileRAW.o FileWAV.o SDRPLAY.o NMEA.o RTLTCP.o HACKRF.o ZMQ.o UDP.o SoapySDR.o TCP.o Message.o SpyServer.o JSON.o JSONAIS.o Protocol.o MsgOut.o Screen.o Logger.o Basestation.o WebDB.o Beast.o ADSB.o Parse.o Convert.o Helper.o Serialize.o TemplateString.o StreamHelpers.o
 INCLUDE = -I. -ISource -ISource/JSON/ -ISource/DBMS/ -ISource/Tracking/ -ISource/Library/ -ISource/Marine/ -ISource/Aviation/ -ISource/DSP/ -ISource/Application/ -ISource/IO/ -ISource/Utilities/ 
 CC = clang
 
@@ -159,23 +159,7 @@ soapysdr-only: AIS-catcher
 %.o: Source/Aviation/%.cpp
 	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
 
-# Special rules for Utilities directory to avoid name conflicts
-UtilParse.o: Source/Utilities/Parse.cpp
-	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
-
-UtilConvert.o: Source/Utilities/Convert.cpp
-	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
-
-UtilHelper.o: Source/Utilities/Helper.cpp
-	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
-
-UtilSerialize.o: Source/Utilities/Serialize.cpp
-	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
-
-UtilTemplateString.o: Source/Utilities/TemplateString.cpp
-	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
-
-UtilStreamHelpers.o: Source/Utilities/StreamHelpers.cpp
+%.o: Source/Utilities/%.cpp
 	$(CC) -c $< $(CFLAGS) $(CFLAGS_ALL) -o $@
 
 clean:

Source/Application/DeviceManager.cpp

@@ -15,10 +15,11 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#include <iostream>
+
 #include "DeviceManager.h"
 #include "Logger.h"
-#include "Utilities/Parse.h"
-#include <iostream>
+#include "Parse.h"
 
 std::vector<Device::Description> DeviceManager::device_list;
 

Source/Application/DeviceManager.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "Common.h"
+
 #include "Device/FileRAW.h"
 #include "Device/FileWAV.h"
 #include "Device/RTLSDR.h"

Source/Application/Receiver.cpp

@@ -16,11 +16,11 @@
 */
 
 #include "Receiver.h"
-#include "Utilities/Convert.h"
-#include "Utilities/Helper.h"
-#include "JSON/StringBuilder.h"
-
+#include "Convert.h"
+#include "Helper.h"
+#include "StringBuilder.h"
 #include "Statistics.h"
+
 //--------------------------------------------
 
 void Receiver::setTags(const std::string &s)

Source/Application/version.h

@@ -16,6 +16,7 @@
 */
 
 #include <iostream>
+
 #include "ADSB.h"
 
 // References:

Source/Aviation/ADSB.cpp

@@ -16,6 +16,7 @@
 */
 
 #pragma once
+
 #include <string>
 #include <time.h>
 #include <vector>

Source/Aviation/ADSB.h

@@ -21,8 +21,7 @@
 
 #include "Message.h"
 #include "Stream.h"
-
-#include "Utilities/Parse.h"
+#include "Parse.h"
 #include "Keys.h"
 #include "ADSB.h"
 

Source/Aviation/Basestation.h

@@ -15,9 +15,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#include <cmath>
+
 #include "Beast.h"
 #include "Logger.h"
-#include <cmath>
 
 // RAW1090 implementation
 void RAW1090::ProcessByte(uint8_t byte, TAG &tag)

Source/Aviation/Beast.cpp

@@ -18,8 +18,8 @@
 #include <cassert>
 
 #include "Model.h"
-#include "Utilities/Parse.h"
-#include "Utilities/Convert.h"
+#include "Parse.h"
+#include "Convert.h"
 
 namespace AIS
 {