diff --git a/src/gpu/GksGpu/DataBase/DataBaseStruct.h b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
index 8e6e9fd9b03a46d55140e193bb491b8c89d32783..3fb5a50a0c396f92d49ebf29fd197067ccda6500 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseStruct.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
@@ -3,7 +3,7 @@
 
 #include "Core/DataTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 namespace GksGpu{ 
 
diff --git a/src/gpu/GksGpu/Parameters/Parameters.h b/src/gpu/GksGpu/Parameters/Parameters.h
index 42950d3ebcb6697d4d68aa42ed31c5d8494a5059..ab7bdb4c61909f3f08b2857e62b458d14d589280 100644
--- a/src/gpu/GksGpu/Parameters/Parameters.h
+++ b/src/gpu/GksGpu/Parameters/Parameters.h
@@ -4,7 +4,7 @@
 #include "Core/DataTypes.h"
 #include "Core/VectorTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "GksGpu_export.h"
 
 namespace GksGpu {
diff --git a/src/gpu/GksGpu/Restart/Restart.h b/src/gpu/GksGpu/Restart/Restart.h
index f607cf355b2f6dc711ac96c79caa31904d4e8c60..235a4334373be3f0b6c788ba5f89d226e5c77f17 100644
--- a/src/gpu/GksGpu/Restart/Restart.h
+++ b/src/gpu/GksGpu/Restart/Restart.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "GksGpu_export.h"
 
 #include "PointerDefinitions.h"
diff --git a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
index 7d7d2bbb1359c728c99d00304497c5ef5fc60596..7f17697625f7ef0b5e136ef073ea91840d0b10ec 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
@@ -10,7 +10,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT JunctionReaderData
 {
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
index d6f71f4b5f05d2c5e1d387d3462324aa90cdb03f..115aea55257f8a2086098699e3d8fc24a8a1d1b5 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
@@ -10,7 +10,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT SinkReaderData{
 	uint sinkIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
index 4ada88fb80ae8bc967aa99c86231f60525115bbb..db95259ea91a60fc2c9ef1721272a4915374e646 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
@@ -8,7 +8,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT SourceReaderData {
 	unsigned int sourceIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
index 5c552d51572008615294f7fde583863b7b1a4523..73d1e0de07c34188d879323a3a762a82f2ed4543 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
@@ -9,7 +9,7 @@
 #include "PointerDefinitions.h"
 #include "Core/DataTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 class Grid;
 
diff --git a/src/gpu/GridGenerator/geometries/Object.h b/src/gpu/GridGenerator/geometries/Object.h
index 3635a24d469f85debe099a125a1350482164af83..e26ff324f27cf68a3d86afb35720af7c32671688 100644
--- a/src/gpu/GridGenerator/geometries/Object.h
+++ b/src/gpu/GridGenerator/geometries/Object.h
@@ -7,7 +7,7 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 #include "GridGenerator_export.h"
-#include <VirtualFluidsDefinitions.h>
+
 #include "grid/Cell.h"
 #include "global.h"
 
diff --git a/src/gpu/Traffic/GPU/TrafficTimestep.h b/src/gpu/Traffic/GPU/TrafficTimestep.h
index d6355afb9ff95b02f74aaf5880a5ebd8ab004677..113cc3d11260d7e89231e50951e75e43e17faf33 100644
--- a/src/gpu/Traffic/GPU/TrafficTimestep.h
+++ b/src/gpu/Traffic/GPU/TrafficTimestep.h
@@ -7,7 +7,7 @@
 #include <thrust/device_vector.h>
 #include <curand_kernel.h>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "PointerDefinitions.h"
 #include "Core/DataTypes.h"
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Junction/Junction.h b/src/gpu/Traffic/Junction/Junction.h
index 6ec6e2f5f84fb5e415543d4b030f29b326eda7ef..68da2bb1063c30e2259925dca6b6aeaec994107d 100644
--- a/src/gpu/Traffic/Junction/Junction.h
+++ b/src/gpu/Traffic/Junction/Junction.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "JunctionData.h"
diff --git a/src/gpu/Traffic/Junction/JunctionData.h b/src/gpu/Traffic/Junction/JunctionData.h
index fde3d50e24ab7154810ccc9d4e18588cbcf8f350..3b72b1ef5db4d60515a2634586e6096aa115731a 100644
--- a/src/gpu/Traffic/Junction/JunctionData.h
+++ b/src/gpu/Traffic/Junction/JunctionData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Junction/JunctionRandom.h b/src/gpu/Traffic/Junction/JunctionRandom.h
index e006aad4897b54bc52f1ec2d669e1fc90777c26f..21ce459685ec6cb09fe5b9d12f2a7e923cb63748 100644
--- a/src/gpu/Traffic/Junction/JunctionRandom.h
+++ b/src/gpu/Traffic/Junction/JunctionRandom.h
@@ -2,7 +2,7 @@
 #include <random> 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Junction.h"
diff --git a/src/gpu/Traffic/Output/CarDisplay.h b/src/gpu/Traffic/Output/CarDisplay.h
index 78386d42b2bcea71100b6ec14fe754f49eaf02cc..336160139220424346a0f4faf2fd269b01840ac1 100644
--- a/src/gpu/Traffic/Output/CarDisplay.h
+++ b/src/gpu/Traffic/Output/CarDisplay.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Output/ConcentrationOutwriter.h b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
index 35fc8e27432d78873eb005db806b82c3bb696335..9589e5f4b6751899e20106cfa41cb4cd29b11205 100644
--- a/src/gpu/Traffic/Output/ConcentrationOutwriter.h
+++ b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
index 352cd5fc76918716b47a4e253144480e4deb5469..3839c53c8449b6c52bfaf7cf0e026559ee5aa9d7 100644
--- a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
+++ b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
@@ -2,7 +2,7 @@
 #include <memory>
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "Source/Source.h"
 #include "Sink/Sink.h"
diff --git a/src/gpu/Traffic/Sink/SinkData.h b/src/gpu/Traffic/Sink/SinkData.h
index f035fa3151e7a394c51a6842cf2f35571698ede8..9603c816ae0733e7f73e4b70c165ba06f5a40e9f 100644
--- a/src/gpu/Traffic/Sink/SinkData.h
+++ b/src/gpu/Traffic/Sink/SinkData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/Source.h b/src/gpu/Traffic/Source/Source.h
index b4cad3a5c12d6c7f62fa17150316b542c52ccf77..3c786b7ee7e1e1a2c0ec38c5a42da293b927f9a1 100644
--- a/src/gpu/Traffic/Source/Source.h
+++ b/src/gpu/Traffic/Source/Source.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "SourceData.h"
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/SourceData.h b/src/gpu/Traffic/Source/SourceData.h
index e19dca7b1251bb2c11987f537842a8e1a4d6373b..e71ec4b5c91581f364a60074f60e1d574fe7d832 100644
--- a/src/gpu/Traffic/Source/SourceData.h
+++ b/src/gpu/Traffic/Source/SourceData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <memory>
diff --git a/src/gpu/Traffic/Source/SourceRandom.h b/src/gpu/Traffic/Source/SourceRandom.h
index bed2077495c4bcf6ff4cde25826209047f8f1de4..5acf83fd788223c011717130d82c1867b5501757 100644
--- a/src/gpu/Traffic/Source/SourceRandom.h
+++ b/src/gpu/Traffic/Source/SourceRandom.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <random>
 
diff --git a/src/gpu/Traffic/TrafficMovement.h b/src/gpu/Traffic/TrafficMovement.h
index bdc2c8690521d4fc673d0650a484de35f0aee0f9..8655e8af0fb1e8aba747cac837ce88e17e3fe0b8 100644
--- a/src/gpu/Traffic/TrafficMovement.h
+++ b/src/gpu/Traffic/TrafficMovement.h
@@ -4,7 +4,7 @@
 #include <random> 
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "RoadNetwork/RoadNetworkData.h"
diff --git a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h
index d813f367d01e560981a831dae7dc8465089e9012..ba27cf68e34dff215984835a097829240c349a2d 100644
--- a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h	
+++ b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h	
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactory.h b/src/gpu/Traffic/TrafficMovementFactory.h
index afa709ab0a515bd0c0eccd17a575d7774e6dfae0..c934d276073afe9c6bec69786a48148470e69b61 100644
--- a/src/gpu/Traffic/TrafficMovementFactory.h
+++ b/src/gpu/Traffic/TrafficMovementFactory.h
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
index afb3854f8e6ff67ba1fe47fe37a9d1de5c548ac4..faafcf89f7911a0589369bca0dfb60ae431d6e03 100644
--- a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
+++ b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Utilities/ConsoleColor.cpp b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
index d8db3d4407ef422199974b08e5cf5447fde556d2..f015fe18fefa656c1495d285b5b928ebcfe26965 100644
--- a/src/gpu/Traffic/Utilities/ConsoleColor.cpp
+++ b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
@@ -2,7 +2,7 @@
 
 
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 
diff --git a/src/gpu/Traffic/Utilities/Logger.h b/src/gpu/Traffic/Utilities/Logger.h
index 3e97cd35af7fed176a77f239bd8a76ef1008e436..a10a567ac5f0e986fafab735e36019698feaf395 100644
--- a/src/gpu/Traffic/Utilities/Logger.h
+++ b/src/gpu/Traffic/Utilities/Logger.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <string>
diff --git a/src/gpu/Traffic/Utilities/RandomHelper.h b/src/gpu/Traffic/Utilities/RandomHelper.h
index 4e0ae40aea18d797c93e2cfb097f2cd588c2416b..869e93ed3e3e2b013a1c79090dc02ccaf6e23897 100644
--- a/src/gpu/Traffic/Utilities/RandomHelper.h
+++ b/src/gpu/Traffic/Utilities/RandomHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <random>
-#include <VirtualFluidsDefinitions.h>
+
 #include "Traffic_export.h"
 
 class TRAFFIC_EXPORT RandomHelper
diff --git a/src/gpu/Traffic/Utilities/VectorHelper.h b/src/gpu/Traffic/Utilities/VectorHelper.h
index 0a76fefd9a9b3525ff7093b04f7fe31ece1eacd0..eccc2b385ea72b3804a5d5aacc03e239e571808c 100644
--- a/src/gpu/Traffic/Utilities/VectorHelper.h
+++ b/src/gpu/Traffic/Utilities/VectorHelper.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Utilities/invalidInput_error.h b/src/gpu/Traffic/Utilities/invalidInput_error.h
index e8e7c7c5ae53e22f6ac4be1f4ca73567b7882336..d3ce3654588328d68f66f398f002f74125d1ea25 100644
--- a/src/gpu/Traffic/Utilities/invalidInput_error.h
+++ b/src/gpu/Traffic/Utilities/invalidInput_error.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 // using standard exceptions
 #include <stdexcept>
diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
index 341d3980b7699f548f2aa708487855e101c93aef..b584bc88081727ad1e298796ed45f1b05039c4f9 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <mpi.h>
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index 1f33ad0374cc61a1f9d6317724dfcd1a95d1dcc3..70a2a8ec629809689096ce0b33a197924cf000a2 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "PointerDefinitions.h"
 #include "VirtualFluids_GPU_export.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
index 9d1ce935226bb135e3c579a8afb141fb608a2c80..22f5db4f16e3b23a8d35be9587bff4ba5d4bf03b 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
@@ -1,7 +1,7 @@
 #ifndef GridReaderFiles_H
 #define GridReaderFiles_H
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "../GridProvider.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index d2ebcf217268de1254088628a5aa2069f67a9e21..66b07deda5d8e21874fd6e1993eed66d91a2884c 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -2,7 +2,7 @@
 #define GridReaderGenerator_H
 
 #include "../GridProvider.h"
-#include <VirtualFluidsDefinitions.h>
+
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index 8a92184e504e008fccb488a192f59b67d4e1604d..afecb7afd5b0ec241de1b408612fe734db3a560c 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <PointerDefinitions.h>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "Output/LogWriter.hpp"
 #include "GPU/KineticEnergyAnalyzer.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
index 2aedd4b79030b528e2cad0fa6a59d5cf864b6404..863d3a116ee2b98d954da256f0df70200d444617 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <string>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "DataWriter.h"