6 files changed, 47 insertions, 17 deletions
diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h
index 99282a8e703..f5ac352752f 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -21,8 +21,11 @@
  * \ingroup render
  */
 
-#ifndef __INITRENDER_H__
-#define __INITRENDER_H__
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Functions */
 
@@ -30,4 +33,6 @@ void RE_parts_init(Render *re);
 void RE_parts_free(Render *re);
 void RE_parts_clamp(Render *re);
 
-#endif /* __INITRENDER_H__ */
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 0ed8871b224..187685cd464 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -21,8 +21,7 @@
  * \ingroup render
  */
 
-#ifndef __RENDER_RESULT_H__
-#define __RENDER_RESULT_H__
+#pragma once
 
 #define PASS_VECTOR_MAX 10000.0f
 
@@ -44,6 +43,10 @@ struct RenderResult;
 struct Scene;
 struct rcti;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* New */
 
 struct RenderResult *render_result_new(struct Render *re,
@@ -148,4 +151,6 @@ bool render_result_has_views(struct RenderResult *rr);
   } \
   ((void)0)
 
-#endif /* __RENDER_RESULT_H__ */
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 3ae4b9c0b90..6be5fb4792c 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -21,8 +21,7 @@
  * \ingroup render
  */
 
-#ifndef __RENDER_TYPES_H__
-#define __RENDER_TYPES_H__
+#pragma once
 
 /* ------------------------------------------------------------------------- */
 /* exposed internal in render module only! */
@@ -43,6 +42,10 @@ struct Object;
 struct RenderEngine;
 struct ReportList;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* this is handed over to threaded hiding/passes/shading engine */
 typedef struct RenderPart {
   struct RenderPart *next, *prev;
@@ -160,4 +163,6 @@ struct Render {
 /* R.flag */
 #define R_ANIMATION 1
 
-#endif /* __RENDER_TYPES_H__ */
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h
index 12b231ef55f..062df59bfd3 100644
--- a/source/blender/render/intern/include/renderpipeline.h
+++ b/source/blender/render/intern/include/renderpipeline.h
@@ -21,8 +21,7 @@
  * \ingroup render
  */
 
-#ifndef __RENDERPIPELINE_H__
-#define __RENDERPIPELINE_H__
+#pragma once
 
 struct ListBase;
 struct Render;
@@ -30,10 +29,16 @@ struct RenderData;
 struct RenderLayer;
 struct RenderResult;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr);
 void render_update_anim_renderdata(struct Render *re,
                                    struct RenderData *rd,
                                    struct ListBase *render_layers);
 void render_copy_renderdata(struct RenderData *to, struct RenderData *from);
 
-#endif /* __RENDERPIPELINE_H__ */
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index f051d3ed318..22023baab95 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -21,8 +21,11 @@
  * \ingroup render
  */
 
-#ifndef __TEXTURE_H__
-#define __TEXTURE_H__
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define BRICONT \
   texres->tin = (texres->tin - 0.5f) * tex->contrast + tex->bright - 0.5f; \
@@ -95,4 +98,6 @@ void image_sample(struct Image *ima,
                   float result[4],
                   struct ImagePool *pool);
 
-#endif /* __TEXTURE_H__ */
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index bc6addd6c5f..b898ff89ae4 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -18,8 +18,11 @@
  * \ingroup render
  */
 
-#ifndef __ZBUF_H__
-#define __ZBUF_H__
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* span fill in method, is also used to localize data for zbuffering */
 typedef struct ZSpan {
@@ -40,4 +43,6 @@ void zspan_scanconvert(struct ZSpan *zpan,
                        float *v3,
                        void (*func)(void *, int, int, float, float));
 
+#ifdef __cplusplus
+}
 #endif