From 9b049fc5c211bfe4df6628004b6773eb8daae92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Widera?= <r.widera@hzdr.de>
Date: Wed, 26 Feb 2014 13:19:39 +0100
Subject: [PATCH 1/3] cleanup includes in param and unitless files

- delete all include of param and unitless files inside unitelss and param files

Note: dependencies inside param und unitless files were **only** managed by *.loader files
---
 .../Bunch/include/simulation_defines/param/observer.hpp   | 2 --
 .../simulation_defines/param/physicalConstants.param      | 1 -
 .../include/simulation_defines/param/visColorScales.param | 1 -
 .../include/simulation_defines/param/visualization.param  | 2 --
 .../include/simulation_defines/param/observer.hpp         | 3 ---
 .../simulation_defines/param/physicalConstants.param      | 1 -
 .../include/simulation_defines/param/visColorScales.param | 7 +------
 .../include/simulation_defines/param/visualization.param  | 2 --
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../simulation_defines/param/physicalConstants.param      | 2 --
 .../include/simulation_defines/param/visColorScales.param | 7 +------
 .../include/simulation_defines/param/visualization.param  | 2 --
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../include/simulation_defines/param/visColorScales.param | 8 +-------
 .../include/simulation_defines/param/visualization.param  | 3 +--
 .../simulation_defines/unitless/backgroundFields.unitless | 1 -
 .../include/simulation_defines/unitless/starter.unitless  | 5 -----
 .../include/simulation_defines/param/observer.hpp         | 3 ---
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../include/simulation_defines/param/visColorScales.param | 7 +------
 .../include/simulation_defines/param/visualization.param  | 3 +--
 .../include/simulation_defines/unitless/starter.unitless  | 5 -----
 .../simulation_defines/unitless/testExtension.unitless    | 2 --
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../include/simulation_defines/param/visColorScales.param | 7 +------
 .../include/simulation_defines/param/visualization.param  | 1 -
 .../simulation_defines/unitless/backgroundFields.unitless | 1 -
 .../include/simulation_defines/unitless/starter.unitless  | 4 ----
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../include/simulation_defines/unitless/starter.unitless  | 5 -----
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../simulation_defines/param/physicalConstants.param      | 1 -
 .../include/simulation_defines/param/visColorScales.param | 7 +------
 .../include/simulation_defines/param/visualization.param  | 2 --
 .../simulation_defines/param/fieldBackground.param        | 3 ---
 .../include/simulation_defines/param/gasConfig.param      | 2 --
 .../include/simulation_defines/param/observer.hpp         | 3 ---
 .../include/simulation_defines/param/particleConfig.param | 1 -
 .../simulation_defines/param/particleDefinition.param     | 1 -
 .../include/simulation_defines/param/visColorScales.param | 6 +-----
 .../include/simulation_defines/param/visualization.param  | 3 ---
 .../simulation_defines/unitless/gasConfig.unitless        | 1 -
 .../simulation_defines/unitless/gridConfig.unitless       | 1 -
 .../simulation_defines/unitless/laserConfig.unitless      | 1 -
 .../simulation_defines/unitless/particleConfig.unitless   | 1 -
 .../unitless/particleDefinition.unitless                  | 1 -
 .../simulation_defines/unitless/radiationConfig.unitless  | 1 -
 .../include/simulation_defines/unitless/starter.unitless  | 1 -
 48 files changed, 9 insertions(+), 118 deletions(-)

diff --git a/examples/Bunch/include/simulation_defines/param/observer.hpp b/examples/Bunch/include/simulation_defines/param/observer.hpp
index 828828e79b..5c531cb058 100644
--- a/examples/Bunch/include/simulation_defines/param/observer.hpp
+++ b/examples/Bunch/include/simulation_defines/param/observer.hpp
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
 
 namespace picongpu
 {
diff --git a/examples/Bunch/include/simulation_defines/param/physicalConstants.param b/examples/Bunch/include/simulation_defines/param/physicalConstants.param
index 093656eb62..1e0bb9b5c0 100644
--- a/examples/Bunch/include/simulation_defines/param/physicalConstants.param
+++ b/examples/Bunch/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {
diff --git a/examples/Bunch/include/simulation_defines/param/visColorScales.param b/examples/Bunch/include/simulation_defines/param/visColorScales.param
index 8307bebc4f..61ff876bc2 100644
--- a/examples/Bunch/include/simulation_defines/param/visColorScales.param
+++ b/examples/Bunch/include/simulation_defines/param/visColorScales.param
@@ -23,7 +23,6 @@
 #ifndef COLORSCALES_HPP
 #define	COLORSCALES_HPP
 
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
diff --git a/examples/Bunch/include/simulation_defines/param/visualization.param b/examples/Bunch/include/simulation_defines/param/visualization.param
index e0c4b8a3d4..da798e161f 100644
--- a/examples/Bunch/include/simulation_defines/param/visualization.param
+++ b/examples/Bunch/include/simulation_defines/param/visualization.param
@@ -23,9 +23,7 @@
 #pragma once
 
 #include <cmath>
-#include "simulation_defines.hpp"
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp b/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp
index f1a64600f8..9edb4977e9 100644
--- a/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp
+++ b/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
-
 namespace picongpu
 {
   namespace radiation_observer
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param b/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param
index d0ed15d860..9cae8fb6a1 100644
--- a/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param
+++ b/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param b/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param
index 02183fa8b6..886e7e64c0 100644
--- a/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param
+++ b/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
  
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param b/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param
index 934ecfe6ad..f078a4c479 100644
--- a/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param
+++ b/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param
@@ -25,8 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "particleConfig.param"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param b/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param
index 7d1206d192..195b4c75fb 100644
--- a/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param
+++ b/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param b/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param
index cebe785ee4..0fbe448cac 100644
--- a/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param
+++ b/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
-
 namespace picongpu
 {
     const double PI = 3.141592653589793238462643383279502884197169399;
diff --git a/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param b/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param
index 3c81ce5ae3..1c20ff8221 100644
--- a/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param
+++ b/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
  
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/LaserWakefield/include/simulation_defines/param/visualization.param b/examples/LaserWakefield/include/simulation_defines/param/visualization.param
index 4f166150dc..8b69ed4361 100644
--- a/examples/LaserWakefield/include/simulation_defines/param/visualization.param
+++ b/examples/LaserWakefield/include/simulation_defines/param/visualization.param
@@ -23,9 +23,7 @@
 #pragma once
 
 #include <cmath>
-#include "simulation_defines.hpp"
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param b/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param
index 440577f60c..9d98bf5cd8 100644
--- a/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param
+++ b/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param b/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param
index 02183fa8b6..290d0ff90e 100644
--- a/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param
+++ b/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,7 @@
  */ 
  
 
-
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
+#pragma once
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +113,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param b/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param
index f7451457cb..3217bcc722 100644
--- a/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param
+++ b/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
+
 
 namespace picongpu
 {
@@ -83,4 +83,3 @@ DINLINE float_X preChannel3(const float3_X& field_B, const float3_X& field_E, co
 }
 }
 }
-
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless b/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless
index bcf1c3554b..fb9c882874 100644
--- a/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless
+++ b/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/backgroundFields.param"
 
 namespace picongpu
 {
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless b/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless
index bef9693f33..2ae4d66247 100644
--- a/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless
+++ b/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"
@@ -46,4 +42,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp
index 828828e79b..fa35e521e6 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
-
 namespace picongpu
 {
   namespace radiation_observer
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param
index 632f6ee9b6..6549ca46a7 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param
index 02183fa8b6..886e7e64c0 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
  
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param
index e13f3dc75d..4b4e3bd46a 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
+
 
 namespace picongpu
 {
@@ -83,4 +83,3 @@ DINLINE float_X preChannel3(const float3_X& field_B, const float3_X& field_E, co
 }
 }
 }
-
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless
index 6796830866..750224615a 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"
@@ -46,4 +42,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless
index e4f018f7ef..a714bb6666 100644
--- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless
+++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/testExtension.param"
-
 namespace picongpu
 {
     // Constant Background Fields
diff --git a/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param b/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param
index 44ab3602df..e6631ad1b6 100644
--- a/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param
+++ b/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param b/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param
index 02183fa8b6..886e7e64c0 100644
--- a/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param
+++ b/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
  
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/SingleParticleTest/include/simulation_defines/param/visualization.param b/examples/SingleParticleTest/include/simulation_defines/param/visualization.param
index e13f3dc75d..7faf81f247 100644
--- a/examples/SingleParticleTest/include/simulation_defines/param/visualization.param
+++ b/examples/SingleParticleTest/include/simulation_defines/param/visualization.param
@@ -25,7 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless b/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless
index 68cef5223b..d5e01ff39f 100644
--- a/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless
+++ b/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/backgroundFields.param"
 
 namespace picongpu
 {
diff --git a/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless b/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless
index ab61346f18..feb004cf3d 100644
--- a/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless
+++ b/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"
diff --git a/examples/ThermalTest/include/simulation_defines/param/particleConfig.param b/examples/ThermalTest/include/simulation_defines/param/particleConfig.param
index 2e37e9cb30..76c4dd1acf 100644
--- a/examples/ThermalTest/include/simulation_defines/param/particleConfig.param
+++ b/examples/ThermalTest/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless b/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless
index fb0a12dcc7..14842b5e99 100644
--- a/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless
+++ b/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitialiserController.hpp"
 #include "ThermalTestSimulation.hpp"
@@ -47,4 +43,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param b/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param
index 7e3a574be1..7846367fe1 100644
--- a/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param
+++ b/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param b/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param
index 6f6324faf8..77666028e3 100644
--- a/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param
+++ b/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param b/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param
index 02183fa8b6..886e7e64c0 100644
--- a/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param
+++ b/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
  
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/visualization.param b/examples/WeibelTransverse/include/simulation_defines/param/visualization.param
index d39a915961..c506e5dbc6 100644
--- a/examples/WeibelTransverse/include/simulation_defines/param/visualization.param
+++ b/examples/WeibelTransverse/include/simulation_defines/param/visualization.param
@@ -25,8 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "particleConfig.param"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/src/picongpu/include/simulation_defines/param/fieldBackground.param b/src/picongpu/include/simulation_defines/param/fieldBackground.param
index ff7ce97e66..ef6293ed2f 100644
--- a/src/picongpu/include/simulation_defines/param/fieldBackground.param
+++ b/src/picongpu/include/simulation_defines/param/fieldBackground.param
@@ -20,9 +20,6 @@
 
 #pragma once
 
-#include "physicalConstants.param"
-#include "gridConfig.param"
-
 /** Load external background fields
  * 
  */
diff --git a/src/picongpu/include/simulation_defines/param/gasConfig.param b/src/picongpu/include/simulation_defines/param/gasConfig.param
index f41f645c27..1e037f5a48 100644
--- a/src/picongpu/include/simulation_defines/param/gasConfig.param
+++ b/src/picongpu/include/simulation_defines/param/gasConfig.param
@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include "types.h"
-
 namespace picongpu
 {
     namespace SI
diff --git a/src/picongpu/include/simulation_defines/param/observer.hpp b/src/picongpu/include/simulation_defines/param/observer.hpp
index 567ee279d8..180b3cfb7b 100644
--- a/src/picongpu/include/simulation_defines/param/observer.hpp
+++ b/src/picongpu/include/simulation_defines/param/observer.hpp
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
-
 namespace picongpu
 {
   namespace radiation_observer
diff --git a/src/picongpu/include/simulation_defines/param/particleConfig.param b/src/picongpu/include/simulation_defines/param/particleConfig.param
index cf2d4ff3ad..9ae27a7335 100644
--- a/src/picongpu/include/simulation_defines/param/particleConfig.param
+++ b/src/picongpu/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu
diff --git a/src/picongpu/include/simulation_defines/param/particleDefinition.param b/src/picongpu/include/simulation_defines/param/particleDefinition.param
index 94b8d418a4..0ccc3f2e02 100644
--- a/src/picongpu/include/simulation_defines/param/particleDefinition.param
+++ b/src/picongpu/include/simulation_defines/param/particleDefinition.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "types.h"
 #include "particles/Identifier.hpp"
 #include "compileTime/conversion/MakeSeq.hpp"
 #include "dimensions/DataSpace.hpp"
diff --git a/src/picongpu/include/simulation_defines/param/visColorScales.param b/src/picongpu/include/simulation_defines/param/visColorScales.param
index bf68dabd37..d542691c33 100644
--- a/src/picongpu/include/simulation_defines/param/visColorScales.param
+++ b/src/picongpu/include/simulation_defines/param/visColorScales.param
@@ -20,10 +20,8 @@
  
 
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
+#pragma once
 
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +115,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/src/picongpu/include/simulation_defines/param/visualization.param b/src/picongpu/include/simulation_defines/param/visualization.param
index 42b4e124d7..7fc17f9373 100644
--- a/src/picongpu/include/simulation_defines/param/visualization.param
+++ b/src/picongpu/include/simulation_defines/param/visualization.param
@@ -19,13 +19,10 @@
  */ 
  
 
-
 #pragma once
 
 #include <cmath>
-#include "simulation_defines.hpp"
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {
diff --git a/src/picongpu/include/simulation_defines/unitless/gasConfig.unitless b/src/picongpu/include/simulation_defines/unitless/gasConfig.unitless
index 3a31fa8c09..b3c697ef29 100644
--- a/src/picongpu/include/simulation_defines/unitless/gasConfig.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/gasConfig.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 
 namespace picongpu
 {
diff --git a/src/picongpu/include/simulation_defines/unitless/gridConfig.unitless b/src/picongpu/include/simulation_defines/unitless/gridConfig.unitless
index 3ead87f150..54d5e45a7f 100644
--- a/src/picongpu/include/simulation_defines/unitless/gridConfig.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/gridConfig.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 #include "static_assert.hpp"
 #include "math/ConstVector.hpp"
 
diff --git a/src/picongpu/include/simulation_defines/unitless/laserConfig.unitless b/src/picongpu/include/simulation_defines/unitless/laserConfig.unitless
index d1bd8cf432..3039ffc0d7 100644
--- a/src/picongpu/include/simulation_defines/unitless/laserConfig.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/laserConfig.unitless
@@ -99,4 +99,3 @@ namespace picongpu
 #include "fields/laserProfiles/laserPlaneWave.hpp"
 #include "fields/laserProfiles/laserPolynom.hpp"
 #include "fields/laserProfiles/laserNone.hpp"
-
diff --git a/src/picongpu/include/simulation_defines/unitless/particleConfig.unitless b/src/picongpu/include/simulation_defines/unitless/particleConfig.unitless
index 4ee81a87f4..0e8ea8de30 100644
--- a/src/picongpu/include/simulation_defines/unitless/particleConfig.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/particleConfig.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/particleConfig.param"
 #include "static_assert.hpp"
 
 namespace picongpu
diff --git a/src/picongpu/include/simulation_defines/unitless/particleDefinition.unitless b/src/picongpu/include/simulation_defines/unitless/particleDefinition.unitless
index 94ec4de8fe..8b01694fec 100644
--- a/src/picongpu/include/simulation_defines/unitless/particleDefinition.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/particleDefinition.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "types.h"
 #include <vector>
 #include "traits/Unit.hpp"
 
diff --git a/src/picongpu/include/simulation_defines/unitless/radiationConfig.unitless b/src/picongpu/include/simulation_defines/unitless/radiationConfig.unitless
index 56a5e263df..8e0dc5ad06 100644
--- a/src/picongpu/include/simulation_defines/unitless/radiationConfig.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/radiationConfig.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/radiationConfig.param"
 #include "static_assert.hpp"
 
 
diff --git a/src/picongpu/include/simulation_defines/unitless/starter.unitless b/src/picongpu/include/simulation_defines/unitless/starter.unitless
index e9b746b16f..46bd8755b7 100644
--- a/src/picongpu/include/simulation_defines/unitless/starter.unitless
+++ b/src/picongpu/include/simulation_defines/unitless/starter.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
 #include "initialization/InitialiserController.hpp"
 #include "plugins/PluginController.hpp"
 #include "simulationControl/MySimulation.hpp"

From 2e6513dd4ba6a8a9ffe1c79059d395a9197e64ed Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@web.de>
Date: Wed, 26 Feb 2014 14:19:16 +0100
Subject: [PATCH 2/3] Add Change Log Param Changes

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc4af47ea0..e559e42e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,12 @@ This is the 4th release candidate, a *pre-beta* version.
 ### Changes to "Open Beta RC3"
 
 **.param file changes:**
- - n/a
+ - Removed unnesseary includes #234 from:
+   `observer.hpp`, `physicalConstants.param`, `visColorScales.param`,
+   `visualization.param`, `particleConfig.param`, `gasConfig.param`,
+   `fieldBackground.param`, `particleDefinition.param`
+   see the lines that should be removed in
+   (#234)[https://github.com/ComputationalRadiationPhysics/picongpu/pull/234/files]
 
 **New Features:**
  - n/a

From 6f3665cd9e8bbdbae6dce588afefbc609eaf1d2f Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@web.de>
Date: Wed, 26 Feb 2014 14:21:28 +0100
Subject: [PATCH 3/3] Correct MD braces format mismatch in link

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e559e42e2f..a58ab59e2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ This is the 4th release candidate, a *pre-beta* version.
    `visualization.param`, `particleConfig.param`, `gasConfig.param`,
    `fieldBackground.param`, `particleDefinition.param`
    see the lines that should be removed in
-   (#234)[https://github.com/ComputationalRadiationPhysics/picongpu/pull/234/files]
+   [#234](https://github.com/ComputationalRadiationPhysics/picongpu/pull/234/files)
 
 **New Features:**
  - n/a