diff --git a/src/audio/heap.c b/src/audio/heap.c
index dcfb849c..bb834368 100644
--- a/src/audio/heap.c
+++ b/src/audio/heap.c
@@ -340,7 +340,7 @@ extern s32 D_SH_80315EE8;
 void sound_init_main_pools(s32 sizeForAudioInitPool) {
     sound_alloc_pool_init(&gAudioInitPool, gAudioHeap, sizeForAudioInitPool);
     sound_alloc_pool_init(&gAudioSessionPool, gAudioHeap + sizeForAudioInitPool, gAudioHeapSize - sizeForAudioInitPool);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     audioPool[0] = sizeForAudioInitPool;
     audioPool[1] = gAudioHeapSize - sizeForAudioInitPool;
     #endif
@@ -356,7 +356,7 @@ void session_pools_init(struct PoolSplit *a) {
     gAudioSessionPool.cur = gAudioSessionPool.start;
     sound_alloc_pool_init(&gNotesAndBuffersPool, SOUND_ALLOC_FUNC(&gAudioSessionPool, a->wantSeq), a->wantSeq);
     sound_alloc_pool_init(&gSeqAndBankPool, SOUND_ALLOC_FUNC(&gAudioSessionPool, a->wantCustom), a->wantCustom);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     audioPool[2] = a->wantSeq;
     audioPool[3] = a->wantCustom;
     #endif
@@ -366,7 +366,7 @@ void seq_and_bank_pool_init(struct PoolSplit2 *a) {
     gSeqAndBankPool.cur = gSeqAndBankPool.start;
     sound_alloc_pool_init(&gPersistentCommonPool, SOUND_ALLOC_FUNC(&gSeqAndBankPool, a->wantPersistent), a->wantPersistent);
     sound_alloc_pool_init(&gTemporaryCommonPool, SOUND_ALLOC_FUNC(&gSeqAndBankPool, a->wantTemporary), a->wantTemporary);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     audioPool[4] = a->wantPersistent;
     audioPool[5] = a->wantTemporary;
     #endif
@@ -377,7 +377,7 @@ void persistent_pools_init(struct PoolSplit *a) {
     sound_alloc_pool_init(&gSeqLoadedPool.persistent.pool, SOUND_ALLOC_FUNC(&gPersistentCommonPool, a->wantSeq), a->wantSeq);
     sound_alloc_pool_init(&gBankLoadedPool.persistent.pool, SOUND_ALLOC_FUNC(&gPersistentCommonPool, a->wantBank), a->wantBank);
     sound_alloc_pool_init(&gUnusedLoadedPool.persistent.pool, SOUND_ALLOC_FUNC(&gPersistentCommonPool, a->wantUnused), a->wantUnused);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     audioPool[6] = a->wantSeq;
     audioPool[7] = a->wantBank;
     audioPool[8] = a->wantUnused;
@@ -392,7 +392,7 @@ void temporary_pools_init(struct PoolSplit *a) {
     sound_alloc_pool_init(&gSeqLoadedPool.temporary.pool, SOUND_ALLOC_FUNC(&gTemporaryCommonPool, a->wantSeq), a->wantSeq);
     sound_alloc_pool_init(&gBankLoadedPool.temporary.pool, SOUND_ALLOC_FUNC(&gTemporaryCommonPool, a->wantBank), a->wantBank);
     sound_alloc_pool_init(&gUnusedLoadedPool.temporary.pool, SOUND_ALLOC_FUNC(&gTemporaryCommonPool, a->wantUnused), a->wantUnused);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     audioPool[9] = a->wantSeq;
     audioPool[10] = a->wantBank;
     audioPool[11] = a->wantUnused;
@@ -1275,7 +1275,7 @@ void audio_reset_session(void) {
 
     if (toggleBetterReverb && betterReverbWindowsSize >= 0)
         reverbWindowSize = betterReverbWindowsSize;
-    
+
     if (gReverbDownsampleRate < (1 << (reverbConsole - 1)))
         gReverbDownsampleRate = (1 << (reverbConsole - 1));
     reverbWindowSize /= gReverbDownsampleRate;
diff --git a/src/audio/load.c b/src/audio/load.c
index 2a60379b..9ee4da8d 100644
--- a/src/audio/load.c
+++ b/src/audio/load.c
@@ -142,12 +142,12 @@ u8 audioString49[] = "BANK LOAD MISS! FOR %d\n";
  * Performs an asynchronus (normal priority) DMA copy
  */
 void audio_dma_copy_async(uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *queue, OSIoMesg *mesg) {
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
     osInvalDCache(vAddr, nbytes);
     osPiStartDma(mesg, OS_MESG_PRI_NORMAL, OS_READ, devAddr, vAddr, nbytes, queue);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     dmaAudioTime[perfIteration] += osGetTime()-first;
     #endif
 }
@@ -157,7 +157,7 @@ void audio_dma_copy_async(uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQ
  * to 0x1000 bytes transfer at once.
  */
 void audio_dma_partial_copy_async(uintptr_t *devAddr, u8 **vAddr, ssize_t *remaining, OSMesgQueue *queue, OSIoMesg *mesg) {
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 #if defined(VERSION_EU)
@@ -170,7 +170,7 @@ void audio_dma_partial_copy_async(uintptr_t *devAddr, u8 **vAddr, ssize_t *remai
     osPiStartDma(mesg, OS_MESG_PRI_NORMAL, OS_READ, *devAddr, *vAddr, transfer, queue);
     *devAddr += transfer;
     *vAddr += transfer;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     dmaAudioTime[perfIteration] += osGetTime()-first;
     #endif
 }
@@ -220,7 +220,7 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
     u32 dmaIndex;
     ssize_t bufferPos;
     UNUSED u32 pad;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -248,12 +248,12 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
                 dma->ttl = 60;
                 *dmaIndexRef = (u8) i;
 #if defined(VERSION_EU)
-                #ifdef PUPPYPRINT
+                #if PUPPYPRINT_DEBUG
                 dmaAudioTime[perfIteration] += osGetTime()-first;
                 #endif
                 return &dma->buffer[(devAddr - dma->source)];
 #else
-                #ifdef PUPPYPRINT
+                #if PUPPYPRINT_DEBUG
                 dmaAudioTime[perfIteration] += osGetTime()-first;
                 #endif
                 return (devAddr - dma->source) + dma->buffer;
@@ -296,12 +296,12 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
             }
             dma->ttl = 2;
 #if defined(VERSION_EU)
-            #ifdef PUPPYPRINT
+            #if PUPPYPRINT_DEBUG
             dmaAudioTime[perfIteration] += osGetTime()-first;
             #endif
             return dma->buffer + (devAddr - dma->source);
 #else
-            #ifdef PUPPYPRINT
+            #if PUPPYPRINT_DEBUG
             dmaAudioTime[perfIteration] += osGetTime()-first;
             #endif
             return (devAddr - dma->source) + dma->buffer;
@@ -329,7 +329,7 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
     osPiStartDma(&gCurrAudioFrameDmaIoMesgBufs[gCurrAudioFrameDmaCount++], OS_MESG_PRI_NORMAL,
                      OS_READ, dmaDevAddr, dma->buffer, transfer, &gCurrAudioFrameDmaQueue);
     *dmaIndexRef = dmaIndex;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     dmaAudioTime[perfIteration] += osGetTime()-first;
     #endif
     return (devAddr - dmaDevAddr) + dma->buffer;
@@ -338,7 +338,7 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
     osPiStartDma(&gCurrAudioFrameDmaIoMesgBufs[gCurrAudioFrameDmaCount - 1], OS_MESG_PRI_NORMAL,
                  OS_READ, dmaDevAddr, dma->buffer, transfer, &gCurrAudioFrameDmaQueue);
     *dmaIndexRef = dmaIndex;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     dmaAudioTime[perfIteration] += osGetTime()-first;
     #endif
     return dma->buffer + (devAddr - dmaDevAddr);
diff --git a/src/engine/math_util.c b/src/engine/math_util.c
index a16c29f0..76084582 100644
--- a/src/engine/math_util.c
+++ b/src/engine/math_util.c
@@ -976,7 +976,7 @@ void find_surface_on_ray_list(struct SurfaceNode *list, Vec3f orig, Vec3f dir, f
     f32 length;
     Vec3f chk_hit_pos;
     f32 top, bottom;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -1010,7 +1010,7 @@ void find_surface_on_ray_list(struct SurfaceNode *list, Vec3f orig, Vec3f dir, f
             }
         }
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 }
diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c
index 26da733c..93654597 100644
--- a/src/engine/surface_collision.c
+++ b/src/engine/surface_collision.c
@@ -188,7 +188,7 @@ s32 find_wall_collisions(struct WallCollisionData *colData) {
     s32 numCollisions = 0;
     s32 x = colData->x;
     s32 z = colData->z;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -217,7 +217,7 @@ s32 find_wall_collisions(struct WallCollisionData *colData) {
     // Increment the debug tracker.
     gNumCalls.wall += 1;
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
@@ -307,7 +307,7 @@ f32 find_ceil(f32 posX, f32 posY, f32 posZ, struct Surface **pceil) {
     f32 height = CELL_HEIGHT_LIMIT;
     f32 dynamicHeight = CELL_HEIGHT_LIMIT;
     s32 x, y, z;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -345,7 +345,7 @@ f32 find_ceil(f32 posX, f32 posY, f32 posZ, struct Surface **pceil) {
     // Increment the debug tracker.
     gNumCalls.ceil += 1;
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
@@ -574,7 +574,7 @@ f32 unused_find_dynamic_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfl
  */
 f32 find_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfloor) {
     s32 cellZ, cellX;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -594,13 +594,13 @@ f32 find_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfloor) {
     *pfloor = NULL;
 
     if (x <= -LEVEL_BOUNDARY_MAX || x >= LEVEL_BOUNDARY_MAX) {
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         collisionTime[perfIteration] += osGetTime()-first;
         #endif
         return height;
     }
     if (z <= -LEVEL_BOUNDARY_MAX || z >= LEVEL_BOUNDARY_MAX) {
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         collisionTime[perfIteration] += osGetTime()-first;
         #endif
         return height;
@@ -649,7 +649,7 @@ f32 find_floor(f32 xPos, f32 yPos, f32 zPos, struct Surface **pfloor) {
     // Increment the debug tracker.
     gNumCalls.floor += 1;
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
@@ -710,7 +710,7 @@ s32 find_water_level_and_floor(s32 x, s32 z, struct Surface **pfloor) {
     s32 waterLevel = FLOOR_LOWER_LIMIT;
     TerrainData *p = gEnvironmentRegions;
     struct Surface *floor = NULL;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -743,7 +743,7 @@ s32 find_water_level_and_floor(s32 x, s32 z, struct Surface **pfloor) {
         *pfloor = floor;
     }
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
@@ -761,7 +761,7 @@ s32 find_water_level(s32 x, s32 z) {
     s32 waterLevel = FLOOR_LOWER_LIMIT;
     TerrainData *p = gEnvironmentRegions;
     struct Surface *floor;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -792,7 +792,7 @@ s32 find_water_level(s32 x, s32 z) {
         }
     }
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
@@ -809,7 +809,7 @@ s32 find_poison_gas_level(s32 x, s32 z) {
     s32 loX, hiX, loZ, hiZ;
     s32 gasLevel = FLOOR_LOWER_LIMIT;
     TerrainData *p = gEnvironmentRegions;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -838,7 +838,7 @@ s32 find_poison_gas_level(s32 x, s32 z) {
         }
     }
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 
diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c
index 935001f7..9571c518 100644
--- a/src/engine/surface_load.c
+++ b/src/engine/surface_load.c
@@ -604,7 +604,7 @@ u32 get_area_terrain_size(TerrainData *data) {
 void load_area_terrain(s32 index, TerrainData *data, RoomData *surfaceRooms, s16 *macroObjects) {
     s32 terrainLoadType;
     TerrainData *vertexData = NULL;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -654,7 +654,7 @@ void load_area_terrain(s32 index, TerrainData *data, RoomData *surfaceRooms, s16
 
     gNumStaticSurfaceNodes = gSurfaceNodesAllocated;
     gNumStaticSurfaces = gSurfacesAllocated;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 }
@@ -784,7 +784,7 @@ void load_object_surfaces(TerrainData **data, TerrainData *vertexData) {
  */
 void load_object_collision_model(void) {
     TerrainData vertexData[600];
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -821,7 +821,7 @@ void load_object_collision_model(void) {
     } else {
         gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     collisionTime[perfIteration] += osGetTime()-first;
     #endif
 }
diff --git a/src/game/area.c b/src/game/area.c
index e80502e4..63cedc91 100644
--- a/src/game/area.c
+++ b/src/game/area.c
@@ -425,7 +425,7 @@ void render_game(void) {
     }
 
 
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     puppyprint_render_profiler();
     #endif
 
diff --git a/src/game/game_init.c b/src/game/game_init.c
index eed3def9..972ef85c 100644
--- a/src/game/game_init.c
+++ b/src/game/game_init.c
@@ -716,7 +716,7 @@ void setup_game_memory(void) {
  */
 void thread5_game_loop(UNUSED void *arg) {
     struct LevelCommand *addr;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime lastTime = 0;
     #endif
 
@@ -755,7 +755,7 @@ void thread5_game_loop(UNUSED void *arg) {
             continue;
         }
         profiler_log_thread5_time(THREAD5_START);
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         while (TRUE)
         {
             lastTime = osGetTime();
@@ -777,10 +777,10 @@ void thread5_game_loop(UNUSED void *arg) {
         select_gfx_pool();
         read_controller_inputs();
         addr = level_script_execute(addr);
-        #if defined(VISUAL_DEBUG) && !defined(PUPPYPRINT)
+        #if defined(VISUAL_DEBUG) && PUPPYPRINT_DEBUG
         debug_box_input();
         #endif
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         profiler_update(scriptTime, lastTime);
             if (benchmarkLoop > 0 && benchOption == 0)
             {
diff --git a/src/game/main.c b/src/game/main.c
index 5988a777..76123b0a 100644
--- a/src/game/main.c
+++ b/src/game/main.c
@@ -189,7 +189,7 @@ void start_gfx_sptask(void) {
     if (gActiveSPTask == NULL && sCurrentDisplaySPTask != NULL
         && sCurrentDisplaySPTask->state == SPTASK_STATE_NOT_STARTED) {
         profiler_log_gfx_time(TASKS_QUEUED);
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         rspDelta = osGetTime();
         #endif
         start_sptask(M_GFXTASK);
@@ -237,7 +237,7 @@ void handle_vblank(void) {
         if (gActiveSPTask == NULL && sCurrentDisplaySPTask != NULL
             && sCurrentDisplaySPTask->state != SPTASK_STATE_FINISHED) {
             profiler_log_gfx_time(TASKS_QUEUED);
-            #ifdef PUPPYPRINT
+            #if PUPPYPRINT_DEBUG
             rspDelta = osGetTime();
             #endif
             start_sptask(M_GFXTASK);
@@ -272,7 +272,7 @@ void handle_sp_complete(void) {
             // The gfx task completed before we had time to interrupt it.
             // Mark it finished, just like below.
             curSPTask->state = SPTASK_STATE_FINISHED;
-            #ifdef PUPPYPRINT
+            #if PUPPYPRINT_DEBUG
             profiler_update(rspGenTime, rspDelta);
             #endif
             profiler_log_gfx_time(RSP_COMPLETE);
@@ -305,7 +305,7 @@ void handle_sp_complete(void) {
             // The SP process is done, but there is still a Display Processor notification
             // that needs to arrive before we can consider the task completely finished and
             // null out sCurrentDisplaySPTask. That happens in handle_dp_complete.
-            #ifdef PUPPYPRINT
+            #if PUPPYPRINT_DEBUG
             profiler_update(rspGenTime, rspDelta);
             #endif
             profiler_log_gfx_time(RSP_COMPLETE);
@@ -503,10 +503,10 @@ extern u32 gISVFlag;
 void osInitialize_fakeisv() {
     /* global flag to skip `__checkHardware_isv` from being called. */
     gISVFlag = 0x49533634;  // 'IS64'
- 
+
     /* printf writes go to this address, cen64(1) has this hardcoded. */
     gISVDbgPrnAdrs = 0x13FF0000;
- 
+
     /* `__printfunc`, used by `osSyncPrintf` will be set. */
     __osInitialize_isv();
 }
diff --git a/src/game/memory.c b/src/game/memory.c
index c0668939..1f7bcc57 100644
--- a/src/game/memory.c
+++ b/src/game/memory.c
@@ -135,7 +135,7 @@ void main_pool_init(void *start, void *end) {
     sPoolListHeadL->next = NULL;
     sPoolListHeadR->prev = NULL;
     sPoolListHeadR->next = NULL;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     mempool = sPoolFreeSpace;
     #endif
 }
@@ -260,7 +260,7 @@ u32 main_pool_pop_state(void) {
  */
 void dma_read(u8 *dest, u8 *srcStart, u8 *srcEnd) {
     u32 size = ALIGN16(srcEnd - srcStart);
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -276,7 +276,7 @@ void dma_read(u8 *dest, u8 *srcStart, u8 *srcEnd) {
         srcStart += copySize;
         size -= copySize;
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     dmaTime[perfIteration] += osGetTime()-first;
     #endif
 }
@@ -355,7 +355,7 @@ void *load_segment(s32 segment, u8 *srcStart, u8 *srcEnd, u32 side, u8 *bssStart
             set_segment_base_addr(segment, addr);
         }
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     ramsizeSegment[segment+nameTable-2] = (s32)srcEnd- (s32)srcStart;
     #endif
     return addr;
@@ -435,7 +435,7 @@ void *load_segment_decompress(s32 segment, u8 *srcStart, u8 *srcEnd) {
         }
     } else {
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     ramsizeSegment[segment+nameTable-2] = (s32)srcEnd - (s32)srcStart;
     #endif
     return dest;
diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c
index 6188fea2..455190a3 100644
--- a/src/game/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -626,7 +626,7 @@ UNUSED static u16 unused_get_elapsed_time(u64 *cycleCounts, s32 index) {
  */
 void update_objects(UNUSED s32 unused) {
     s64 cycleCounts[30];
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     OSTime colTime = collisionTime[perfIteration];
     #endif
@@ -688,7 +688,7 @@ void update_objects(UNUSED s32 unused) {
     }
 
     gPrevFrameObjectCount = gObjectCounter;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     profiler_update(behaviourTime, first);
     behaviourTime[perfIteration] -= collisionTime[perfIteration]+colTime;
     #endif
diff --git a/src/game/puppyprint.c b/src/game/puppyprint.c
index c6de8632..fbd3786a 100644
--- a/src/game/puppyprint.c
+++ b/src/game/puppyprint.c
@@ -42,9 +42,10 @@ There's also a custom option that's left blank. It runs benchmark_custom which c
 
 u8 currEnv[4];
 u8 fDebug = 0;
+
+#if PUPPYPRINT_DEBUG
 s8 benchViewer = 0;
 u8 benchOption = 0;
-
 //Profiler values
 s8 perfIteration = 0;
 s16 benchmarkLoop = 0;
@@ -491,19 +492,18 @@ void puppyprint_profiler_process(void)
         }
         benchmark_custom();
     }
-    #if PUPPYPRINT_DEBUG
     if (gPlayer1Controller->buttonDown & U_JPAD && gPlayer1Controller->buttonPressed & L_TRIG)
     {
         ramViewer = 0;
         benchViewer = 0;
         fDebug ^= 1;
     }
-    #endif
 
 
     if (perfIteration++ == NUM_PERF_ITERATIONS-1)
         perfIteration = 0;
 }
+#endif
 
 void print_set_envcolour(s32 r, s32 g, s32 b, s32 a)
 {
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 591d1272..5a50acf2 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -1089,7 +1089,7 @@ void geo_process_node_and_siblings(struct GraphNode *firstNode) {
  */
 void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor) {
     UNUSED s32 unused;
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime first = osGetTime();
     #endif
 
@@ -1132,7 +1132,7 @@ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor)
         }
         main_pool_free(gDisplayListHeap);
     }
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     profiler_update(graphTime, first);
     #endif
 }
diff --git a/src/game/sound_init.c b/src/game/sound_init.c
index 77069c6e..36492986 100644
--- a/src/game/sound_init.c
+++ b/src/game/sound_init.c
@@ -336,7 +336,7 @@ void audio_game_loop_tick(void) {
 void thread4_sound(UNUSED void *arg) {
     audio_init();
     sound_init();
-    #ifdef PUPPYPRINT
+    #if PUPPYPRINT_DEBUG
     OSTime lastTime;
     #endif
 
@@ -351,7 +351,7 @@ void thread4_sound(UNUSED void *arg) {
         OSMesg msg;
 
         osRecvMesg(&sSoundMesgQueue, &msg, OS_MESG_BLOCK);
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         while (TRUE)
         {
             lastTime = osGetTime();
@@ -365,7 +365,7 @@ void thread4_sound(UNUSED void *arg) {
                     dispatch_audio_sptask(spTask);
                 }
                 profiler_log_thread4_time();
-                #ifdef PUPPYPRINT
+                #if PUPPYPRINT_DEBUG
                 profiler_update(audioTime, lastTime);
                 audioTime[perfIteration] -= dmaAudioTime[perfIteration];
                 if (benchmarkLoop > 0 && benchOption == 1)
@@ -382,7 +382,7 @@ void thread4_sound(UNUSED void *arg) {
                     break;
                 #endif
             }
-        #ifdef PUPPYPRINT
+        #if PUPPYPRINT_DEBUG
         }
         #endif
     }