Avoid implementations in .h files or #including .c files.

Also, avoid the need for putting `_XOPEN_SOURCE` in every test file.

5 files changed, 15 insertions, 12 deletions

diff --git a/other/BUILD.bazel b/other/BUILD.bazel
index beec2397..8bcdc4b4 100644
--- a/other/BUILD.bazel
+++ b/other/BUILD.bazel
@@ -5,6 +5,7 @@ cc_library(
     hdrs = ["monolith.h"],
     visibility = ["//c-toxcore/auto_tests:__pkg__"],
     deps = [
+        "//c-toxcore/testing:monolith",
         "//c-toxcore/toxav:monolith",
         "//c-toxcore/toxcore:monolith",
         "//c-toxcore/toxencryptsave:monolith",
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index b71ab0b1..347e5c82 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -23,11 +23,9 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _XOPEN_SOURCE 600
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "../toxcore/DHT.h"
 #include "../toxcore/LAN_discovery.h"
@@ -43,7 +41,7 @@
 #include "../toxcore/TCP_server.h"
 #endif
 
-#include "../testing/misc_tools.c"
+#include "../testing/misc_tools.h"
 
 #ifdef DHT_NODE_EXTRA_PACKETS
 #include "./bootstrap_node_packets.h"
diff --git a/other/Makefile.inc b/other/Makefile.inc
index 10cd48b4..6d4ec593 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -14,6 +14,7 @@ DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
 
 DHT_bootstrap_LDADD =   $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
+                        libmisc_tools.la \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
diff --git a/other/fun/cracker.c b/other/fun/cracker.c
index 9cfe96d7..502a8af0 100644
--- a/other/fun/cracker.c
+++ b/other/fun/cracker.c
@@ -9,15 +9,16 @@
  * Will try to find a public key starting with: ABCDEF
  */
 
-#include "../../testing/misc_tools.c"
-#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-/* NaCl includes*/
+/* Sodium includes*/
 #include <sodium/crypto_scalarmult_curve25519.h>
 #include <sodium/randombytes.h>
 
-/* Sodium include*/
-//#include <sodium.h>
+#include "../../testing/misc_tools.h"
+#include "../../toxcore/ccompat.h"
 
 void print_key(uint8_t *client_id)
 {
diff --git a/other/fun/sign.c b/other/fun/sign.c
index 369bc848..007d19a0 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -15,10 +15,12 @@
  *
  * NOTE: The signature is appended to the end of the file.
  */
-#include "../../testing/misc_tools.c" // hex_string_to_bin
 #include <sodium.h>
 #include <string.h>
 
+#include "../../testing/misc_tools.h" // hex_string_to_bin
+#include "../../toxcore/ccompat.h"
+
 int load_file(char *filename, char **result)
 {
     int size = 0;