diff --git a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
index c701f28f131..46445467869 100644
--- a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
+++ b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
@@ -51,8 +51,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-
-#include <stdio.h>
+typedef unsigned int uint;
 
 #include "curve_fit_inline.h"
 #include "../curve_fit_nd.h"
@@ -101,9 +100,6 @@
 #  define UNLIKELY(x)     (x)
 #endif
 
-
-typedef unsigned int uint;
-
 struct PointData {
 	const double *points;
 	uint          points_len;
diff --git a/extern/curve_fit_nd/intern/generic_heap.h b/extern/curve_fit_nd/intern/generic_heap.h
index 74327c761e4..e39344cf076 100644
--- a/extern/curve_fit_nd/intern/generic_heap.h
+++ b/extern/curve_fit_nd/intern/generic_heap.h
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __GENERIC_HEAP_IMPL_H__
-#define __GENERIC_HEAP_IMPL_H__
+#ifndef __GENERIC_HEAP_H__
+#define __GENERIC_HEAP_H__
 
 /** \file generic_heap.h
  *  \ingroup curve_fit