diff --git a/include/ircd/portable.h b/include/ircd/portable.h
index 70f3b964f..d79efdad5 100644
--- a/include/ircd/portable.h
+++ b/include/ircd/portable.h
@@ -42,7 +42,7 @@
 // 128 bit integer support
 //
 
-#if !defined(HAVE_INT128_T) || !defined(HAVE_UINT128_T)
+#if defined(__cplusplus) && (!defined(HAVE_INT128_T) || !defined(HAVE_UINT128_T))
 namespace ircd
 {
 	#if defined(HAVE___INT128_T) && defined(HAVE__UINT128_T)
@@ -57,6 +57,26 @@ namespace ircd
 }
 #endif
 
+//
+// Other convenience typedefs
+//
+
+#if defined(__cplusplus)
+namespace ircd
+{
+    using longlong = long long;
+    using ulonglong = unsigned long long;
+}
+#endif
+
+//
+// OpenCL compat
+//
+
+#if !defined(uchar)
+	typedef unsigned char uchar;
+#endif
+
 //
 // Trouble; FreeBSD unsigned long ctype
 //
@@ -64,11 +84,3 @@ namespace ircd
 #if defined(__FreeBSD__) && !defined(ulong)
 	typedef u_long ulong;
 #endif
-
-//
-// Other
-//
-
-#if !defined(uchar)
-	typedef unsigned char uchar;
-#endif
diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h
index 4bc428113..6bf84d686 100644
--- a/include/ircd/stdinc.h
+++ b/include/ircd/stdinc.h
@@ -175,9 +175,6 @@ namespace std
 
 namespace ircd
 {
-	using longlong = long long;
-	using ulonglong = unsigned long long;
-
 	using std::get;
 	using std::end;
 	using std::begin;