diff --git a/Samples/0_Introduction/simpleIPC/simpleIPC.cu b/Samples/0_Introduction/simpleIPC/simpleIPC.cu
index 544be8bd..b921cbb1 100644
--- a/Samples/0_Introduction/simpleIPC/simpleIPC.cu
+++ b/Samples/0_Introduction/simpleIPC/simpleIPC.cu
@@ -101,7 +101,7 @@ static void childProcess(int id)
     std::vector<char>        verification_buffer(DATA_SIZE);
     pid_t                    pid;
     char                     pidString[20] = {0};
-    char                     lshmName[40] = {0};
+    char                     lshmName[40]  = {0};
 
     pid = getppid();
     snprintf(pidString, sizeof(pidString), "%d", pid);
@@ -207,7 +207,7 @@ static void parentProcess(char *app)
     std::vector<Process>     processes;
     pid_t                    pid;
     char                     pidString[20] = {0};
-    char                     lshmName[40] = {0};
+    char                     lshmName[40]  = {0};
 
     pid = getpid();
     snprintf(pidString, sizeof(pidString), "%d", pid);
diff --git a/Samples/2_Concepts_and_Techniques/streamOrderedAllocationIPC/streamOrderedAllocationIPC.cu b/Samples/2_Concepts_and_Techniques/streamOrderedAllocationIPC/streamOrderedAllocationIPC.cu
index b7dbdf66..3bfa9fe5 100644
--- a/Samples/2_Concepts_and_Techniques/streamOrderedAllocationIPC/streamOrderedAllocationIPC.cu
+++ b/Samples/2_Concepts_and_Techniques/streamOrderedAllocationIPC/streamOrderedAllocationIPC.cu
@@ -104,7 +104,7 @@ static void childProcess(int id)
     std::vector<void *> ptrs;
     pid_t               pid;
     char                pidString[20] = {0};
-    char                lshmName[40] = {0};
+    char                lshmName[40]  = {0};
 
     std::vector<char> verification_buffer(DATA_SIZE);
 
@@ -257,7 +257,7 @@ static void parentProcess(char *app)
     cudaMemAllocationHandleType handleType = cudaMemHandleTypeNone;
     pid_t                       pid;
     char                        pidString[20] = {0};
-    char                        lshmName[40] = {0};
+    char                        lshmName[40]  = {0};
 
     pid = getpid();
     snprintf(pidString, sizeof(pidString), "%d", pid);
diff --git a/Samples/3_CUDA_Features/memMapIPCDrv/memMapIpc.cpp b/Samples/3_CUDA_Features/memMapIPCDrv/memMapIpc.cpp
index d95ffb64..06a6661b 100644
--- a/Samples/3_CUDA_Features/memMapIPCDrv/memMapIpc.cpp
+++ b/Samples/3_CUDA_Features/memMapIPCDrv/memMapIpc.cpp
@@ -311,8 +311,8 @@ static void childProcess(int devId, int id, char **argv)
     int                 blocks         = 0;
     int                 threads        = 128;
     pid_t               pid;
-    char                pidString[20]  = {0};
-    char                lshmName[40]   = {0};
+    char                pidString[20] = {0};
+    char                lshmName[40]  = {0};
 
     pid = getppid();
     snprintf(pidString, sizeof(pidString), "%d", pid);
diff --git a/Samples/4_CUDA_Libraries/cudaNvSci/main.cpp b/Samples/4_CUDA_Libraries/cudaNvSci/main.cpp
index 461fc906..b01dc430 100644
--- a/Samples/4_CUDA_Libraries/cudaNvSci/main.cpp
+++ b/Samples/4_CUDA_Libraries/cudaNvSci/main.cpp
@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cuda_runtime.h>
 #include <cuda.h>
+#include <cuda_runtime.h>
 #include <helper_cuda.h>
 #include <helper_image.h>
 #include <vector>
diff --git a/Samples/4_CUDA_Libraries/oceanFFT/oceanFFT.cpp b/Samples/4_CUDA_Libraries/oceanFFT/oceanFFT.cpp
index e19eed80..8eeb9da8 100644
--- a/Samples/4_CUDA_Libraries/oceanFFT/oceanFFT.cpp
+++ b/Samples/4_CUDA_Libraries/oceanFFT/oceanFFT.cpp
@@ -45,8 +45,10 @@
 #include <windows.h>
 #endif
 
-// includes
+// includes for OpenGL
 #include <helper_gl.h>
+
+// includes
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <cufft.h>
diff --git a/Samples/5_Domain_Specific/marchingCubes/marchingCubes.cpp b/Samples/5_Domain_Specific/marchingCubes/marchingCubes.cpp
index 71c08ee2..c6bcb450 100644
--- a/Samples/5_Domain_Specific/marchingCubes/marchingCubes.cpp
+++ b/Samples/5_Domain_Specific/marchingCubes/marchingCubes.cpp
@@ -86,8 +86,10 @@
 #include <windows.h>
 #endif
 
-// includes
+// includes for OpenGL
 #include <helper_gl.h>
+
+// includes
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <helper_cuda.h> // includes cuda.h and cuda_runtime_api.h
diff --git a/Samples/5_Domain_Specific/nbody/render_particles.cpp b/Samples/5_Domain_Specific/nbody/render_particles.cpp
index dfcbf966..8c596fac 100644
--- a/Samples/5_Domain_Specific/nbody/render_particles.cpp
+++ b/Samples/5_Domain_Specific/nbody/render_particles.cpp
@@ -27,9 +27,11 @@
 
 #include "render_particles.h"
 
+// includes for OpenGL
+#include <helper_gl.h>
+
 #define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
 #include <assert.h>
-#include <helper_gl.h>
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
diff --git a/Samples/5_Domain_Specific/simpleD3D11/simpleD3D11.cpp b/Samples/5_Domain_Specific/simpleD3D11/simpleD3D11.cpp
index 8528dd9d..1596c022 100644
--- a/Samples/5_Domain_Specific/simpleD3D11/simpleD3D11.cpp
+++ b/Samples/5_Domain_Specific/simpleD3D11/simpleD3D11.cpp
@@ -31,7 +31,10 @@
 
 #pragma warning(disable : 4312)
 
+// includes for Windows
 #include <windows.h>
+
+// includes for multimedia
 #include <mmsystem.h>
 
 // This header inclues all the necessary D3D11 and CUDA includes
diff --git a/Samples/5_Domain_Specific/simpleD3D11Texture/simpleD3D11Texture.cpp b/Samples/5_Domain_Specific/simpleD3D11Texture/simpleD3D11Texture.cpp
index 3ba66867..113d1bd9 100644
--- a/Samples/5_Domain_Specific/simpleD3D11Texture/simpleD3D11Texture.cpp
+++ b/Samples/5_Domain_Specific/simpleD3D11Texture/simpleD3D11Texture.cpp
@@ -31,7 +31,10 @@
 
 #pragma warning(disable : 4312)
 
+// includes for Windows
 #include <windows.h>
+
+// includes for multimedia
 #include <mmsystem.h>
 
 // This header inclues all the necessary D3D11 and CUDA includes
diff --git a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem.cpp b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem.cpp
index 6c675ca9..c016a88d 100644
--- a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem.cpp
+++ b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem.cpp
@@ -33,7 +33,11 @@
 #include <memory.h>
 
 #define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
+
+// includes for OpenGL
 #include <helper_gl.h>
+
+// includes
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
diff --git a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu
index 2912c2c0..69af1466 100644
--- a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu
+++ b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu
@@ -29,9 +29,13 @@
 This file contains simple wrapper functions that call the CUDA kernels
 */
 #define HELPERGL_EXTERN_GL_FUNC_IMPLEMENTATION
+
+// includes for OpenGL
+#include <helper_gl.h>
+
+// includes
 #include <cstdio>
 #include <cstdlib>
-#include <helper_gl.h>
 #include <cuda_gl_interop.h>
 #include <helper_cuda.h>
 #include <string.h>