diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 023d02e823d..81f5cb4e6f6 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -102,7 +102,7 @@
 #include "initrender.h"
 
 /* yafray: include for yafray export/render */
-#include "yafray_Render.h"
+#include "YafRay_Api.h"
 
 /* Some crud :/ */
 #define ELEM3(a, b, c, d)       ( ELEM(a, b, c) || (a)==(d) )
diff --git a/source/blender/yafray/YafRay_Api.h b/source/blender/yafray/YafRay_Api.h
new file mode 100644
index 00000000000..f36a0b3df0d
--- /dev/null
+++ b/source/blender/yafray/YafRay_Api.h
@@ -0,0 +1,16 @@
+#ifndef __YAFRAY_API_H
+#define __YAFRAY_API_H
+
+/* C interface for Blender */
+#ifdef __cplusplus
+extern "C" {
+#endif
+int YAF_exportScene();
+void YAF_displayImage();
+void YAF_addDupliMtx(Object* obj);
+int YAF_objectKnownData(Object* obj);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/source/blender/src/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp
similarity index 99%
rename from source/blender/src/yafray_Render.cpp
rename to source/blender/yafray/intern/yafray_Render.cpp
index 12ccde289e6..6f759cd81f9 100644
--- a/source/blender/src/yafray_Render.cpp
+++ b/source/blender/yafray/intern/yafray_Render.cpp
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------------
 
 #include "yafray_Render.h"
+
 #include <math.h>
 
 using namespace std;
@@ -118,7 +119,12 @@ bool yafrayRender_t::exportScene()
 	string yfr = "yafray " + xmlpath;
 	if(system(yfr.c_str())==0)
 		displayImage();
-	else cout<<"Could not execute yafray. Is it in path?";
+	else 
+	{
+		G.afbreek=1; //stop render and anim if doing so
+		cout<<"Could not execute yafray. Is it in path?"<<endl;
+		return false;
+	}
 
 	return true;
 
@@ -1197,7 +1203,8 @@ bool yafrayRender_t::writeWorld()
 
 yafrayRender_t YAFBLEND;
 
-extern "C" {
+extern "C" 
+{
 
 int YAF_exportScene() { return (int)YAFBLEND.exportScene(); }
 void YAF_displayImage() { YAFBLEND.displayImage(); }
diff --git a/source/blender/include/yafray_Render.h b/source/blender/yafray/intern/yafray_Render.h
similarity index 92%
rename from source/blender/include/yafray_Render.h
rename to source/blender/yafray/intern/yafray_Render.h
index 79abbbd6087..da3ae40714d 100644
--- a/source/blender/include/yafray_Render.h
+++ b/source/blender/yafray/intern/yafray_Render.h
@@ -116,17 +116,4 @@ extern yafrayRender_t YAFBLEND;
 #endif
 
 
-/* C interface for Blender */
-#ifdef __cplusplus
-extern "C" {
-#endif
-int YAF_exportScene();
-void YAF_displayImage();
-void YAF_addDupliMtx(Object* obj);
-int YAF_objectKnownData(Object* obj);
-#ifdef __cplusplus
-}
-#endif
-
-
 #endif /*__YAFRAY_RENDER_H */